summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-15 14:34:02 +0200
committerTakashi Iwai <tiwai@suse.de>2010-08-15 14:34:02 +0200
commitaaae5272118bcce90d11629f15bc01ea8e545e6d (patch)
treecc90dfb59fd7235e105f0dd366cf96170fc143d4 /MAINTAINERS
parent18c5ef385c65360761f39d55b2e2cd370ab151db (diff)
parenta532f97c71c7a952531e02b0994104c532fbef0f (diff)
downloadlinux-3.10-aaae5272118bcce90d11629f15bc01ea8e545e6d.tar.gz
linux-3.10-aaae5272118bcce90d11629f15bc01ea8e545e6d.tar.bz2
linux-3.10-aaae5272118bcce90d11629f15bc01ea8e545e6d.zip
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 02f75fccac2..eceace1618c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6325,8 +6325,9 @@ S: Supported
F: drivers/input/touchscreen/*wm97*
F: include/linux/wm97xx.h
-WOLFSON MICROELECTRONICS PMIC DRIVERS
+WOLFSON MICROELECTRONICS DRIVERS
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
+M: Ian Lartey <ian@opensource.wolfsonmicro.com>
T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
W: http://opensource.wolfsonmicro.com/node/8
S: Supported
@@ -6341,8 +6342,8 @@ F: drivers/watchdog/wm83*_wdt.c
F: include/linux/mfd/wm831x/
F: include/linux/mfd/wm8350/
F: include/linux/mfd/wm8400*
-F: sound/soc/codecs/wm8350.*
-F: sound/soc/codecs/wm8400.*
+F: include/sound/wm????.h
+F: sound/soc/codecs/wm*
X.25 NETWORK LAYER
M: Andrew Hendry <andrew.hendry@gmail.com>