diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-27 04:43:40 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-27 04:43:40 -0400 |
| commit | bb14eb0da72afb69be261b28ec858cbd5a35e089 (patch) | |
| tree | fa72a87d21e506c990b63657d782936311cfa7cf /MAINTAINERS | |
| parent | 9430148d800dd929ad73da4c6afb67f793f8af43 (diff) | |
| parent | 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a676343a27b..1dbbb278d21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -530,6 +530,7 @@ S: Maintained | |||
| 530 | F: drivers/infiniband/hw/amso1100/ | 530 | F: drivers/infiniband/hw/amso1100/ |
| 531 | 531 | ||
| 532 | ANALOG DEVICES INC ASOC CODEC DRIVERS | 532 | ANALOG DEVICES INC ASOC CODEC DRIVERS |
| 533 | M: Lars-Peter Clausen <lars@metafoo.de> | ||
| 533 | L: device-drivers-devel@blackfin.uclinux.org | 534 | L: device-drivers-devel@blackfin.uclinux.org |
| 534 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 535 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
| 535 | W: http://wiki.analog.com/ | 536 | W: http://wiki.analog.com/ |
| @@ -7199,6 +7200,7 @@ T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus | |||
| 7199 | W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices | 7200 | W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices |
| 7200 | S: Supported | 7201 | S: Supported |
| 7201 | F: Documentation/hwmon/wm83?? | 7202 | F: Documentation/hwmon/wm83?? |
| 7203 | F: arch/arm/mach-s3c64xx/mach-crag6410* | ||
| 7202 | F: drivers/leds/leds-wm83*.c | 7204 | F: drivers/leds/leds-wm83*.c |
| 7203 | F: drivers/input/misc/wm831x-on.c | 7205 | F: drivers/input/misc/wm831x-on.c |
| 7204 | F: drivers/input/touchscreen/wm831x-ts.c | 7206 | F: drivers/input/touchscreen/wm831x-ts.c |