Merge branch 'fix/asoc' into for-linus

This commit is contained in:
Takashi Iwai 2010-10-11 14:36:25 +02:00
commit dd4025bdb6

View file

@ -5008,6 +5008,12 @@ F: drivers/media/common/saa7146*
F: drivers/media/video/*7146*
F: include/media/*7146*
SAMSUNG AUDIO (ASoC) DRIVERS
M: Jassi Brar <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
F: sound/soc/s3c24xx
TLG2300 VIDEO4LINUX-2 DRIVER
M: Huang Shijie <[email protected]>
M: Kang Yong <[email protected]>
@ -6450,8 +6456,10 @@ F: include/linux/wm97xx.h
WOLFSON MICROELECTRONICS DRIVERS
M: Mark Brown <[email protected]>
M: Ian Lartey <[email protected]>
M: Dimitris Papastamos <[email protected]>
T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc
T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
W: http://opensource.wolfsonmicro.com/node/8
W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
S: Supported
F: Documentation/hwmon/wm83??
F: drivers/leds/leds-wm83*.c