Takashi Iwai d71f4cece4 Merge branch 'topic/asoc' into for-linus ... Conflicts: sound/soc/codecs/ad1938.c		2010-05-20 12:00:43 +02:00
..
aoa
arm	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
atmel
core	Merge branch 'topic/jack' into for-linus	2010-05-20 11:59:37 +02:00
drivers	ALSA: opl4 - Fix a wrong argument in proc write callback	2010-05-10 10:21:32 +02:00
i2c	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
isa	Merge branch 'topic/misc' into for-linus	2010-05-20 11:59:29 +02:00
mips
oss
parisc
pci	Merge branch 'topic/hda' into for-linus	2010-05-20 11:59:52 +02:00
pcmcia
ppc	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
sh
soc	Merge branch 'topic/asoc' into for-linus	2010-05-20 12:00:43 +02:00
sparc
spi
synth
usb	Merge branch 'topic/usb' into for-linus	2010-05-20 11:59:43 +02:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c