Mark Brown 43a9519758 Merge branch 'for-3.2' into for-3.3 ... Conflicts: sound/soc/mxs/mxs-pcm.c		2011-12-11 11:24:44 +08:00
..
aoa	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
arm	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
atmel
core	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
drivers	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
firewire	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
i2c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
isa	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
mips	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
oss	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2011-10-28 14:25:01 -07:00
parisc
pci	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pcmcia	sound: fix drivers needing module.h not moduleparam.h	2011-10-31 19:31:19 -04:00
ppc	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
sh	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
soc	Merge branch 'for-3.2' into for-3.3	2011-12-11 11:24:44 +08:00
sparc	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
spi
synth	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
usb	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
ac97_bus.c
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
last.c
Makefile
sound_core.c
sound_firmware.c