Jiri Kosina e75d660672 Merge branch 'master' into for-next ... Merge with latest Linus' tree, as I have incoming patches that fix code that is newer than current HEAD of for-next. Conflicts: drivers/net/ethernet/realtek/r8169.c		2012-04-08 21:48:52 +02:00
..
aoa	ALSA: aoa: Convert onyx and tas codec drivers to module_i2c_driver	2012-01-27 15:18:28 +01:00
arm	ARM: cleanups of io includes	2012-03-29 18:02:10 -07:00
atmel	dmaengine/dw_dmac: Fix dw_dmac user drivers to adapt to slave_config changes	2012-02-22 18:15:39 +05:30
core	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
drivers	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
firewire	IEEE 1394 (FireWire) subsystem updates post v3.3:	2012-03-22 20:31:15 -07:00
i2c	[media] tea575x: fix HW seek	2012-03-19 11:28:52 -03:00
isa	Merge branch 'master' into for-next	2012-04-08 21:48:52 +02:00
mips	ALSA: Convert mips directory to module_platform_driver	2011-11-24 13:03:02 +01:00
oss	sound fixes for 3.4-rc1	2012-03-30 10:59:52 -07:00
parisc
pci	Merge branch 'master' into for-next	2012-04-08 21:48:52 +02:00
pcmcia	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
ppc	Merge branch 'topic/misc' into for-linus	2012-01-12 09:59:14 +01:00
sh	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
soc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
sparc	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
spi	ALSA: Convert at73c213 to module_spi_driver	2012-01-27 15:18:36 +01:00
synth	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
usb	Merge branch 'topic/misc' into for-linus	2012-03-18 18:22:33 +01: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	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
sound_firmware.c