Merge branch 'fix/asoc' into for-linus

This commit is contained in:
Takashi Iwai 2010-08-15 14:34:02 +02:00
commit aaae527211
2 changed files with 19 additions and 11 deletions

View file

@ -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 <[email protected]>
M: Ian Lartey <[email protected]>
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 <[email protected]>