aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-15 11:22:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-15 11:22:00 -0700
commit1b68c9596ce17a1e06918ed65fc3d19b92b04aab (patch)
treed7588c281a92fb30604ddc23f88f748be028921d /MAINTAINERS
parent5a4179460cb50d939a2ae713cf88fcbff75f2c1c (diff)
parentaaae5272118bcce90d11629f15bc01ea8e545e6d (diff)
downloadmrst-s0i3-test-1b68c9596ce17a1e06918ed65fc3d19b92b04aab.tar.gz
mrst-s0i3-test-1b68c9596ce17a1e06918ed65fc3d19b92b04aab.tar.xz
mrst-s0i3-test-1b68c9596ce17a1e06918ed65fc3d19b92b04aab.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: sound/usb/format: silence uninitialized variable warnings MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices MAINTAINERS: Make Wolfson entry also cover CODEC drivers ASoC: Only tweak WM8994 chip configuration on devices up to rev D ASoC: Optimise DSP performance for WM8994 ALSA: hda - Fix dynamic ADC change working again ALSA: hda - Restrict PCM parameters per ELD information over HDMI sound: oss: sh_dac_audio.c removed duplicated #include
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 99b6f8203a5..b5b8baa1d70 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6402,8 +6402,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
@@ -6418,8 +6419,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>