Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
aoa	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
arm	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
atmel	ALSA: atmel - Fix the return value in error path	2010-11-22 10:57:17 +01:00
core	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
drivers	Merge remote branch 'alsa/devel' into topic/misc	2010-10-20 12:22:11 +02:00
i2c	Merge branch 'fix/misc' into topic/misc	2010-10-11 13:45:22 +02:00
isa	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
mips	sound: Add missing spin_unlock	2010-05-27 09:47:02 +02:00
oss	sound/oss: Remove unnecessary casts of void ptr	2010-11-11 01:59:04 +01:00
parisc	ALSA: sound/parisc: Move dereference after NULL test	2009-10-30 12:01:38 +01:00
pci	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
pcmcia	pcmcia: move driver name to struct pcmcia_driver	2010-09-29 17:20:24 +02:00
ppc	ALSA: sound/ppc: Use printf extension %pR for struct resource	2010-11-22 07:41:25 +01:00
sh	sound: sh: ctrl_in/outX to __raw_read/writeX conversion.	2010-10-27 15:53:50 +09:00
soc	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
sparc	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
spi	ALSA: AT73C213: Rectify misleading comment.	2010-11-11 02:03:29 +01:00
synth	ALSA: emux: Add trivial compat ioctl handler	2010-09-14 16:18:11 +02:00
usb	ALSA: usb-audio - Support for Power/Status LED on Creative USB X-Fi S51	2010-11-02 12:40:11 +01:00
Kconfig	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
Makefile	ALSA: Add Atmel ALSA drivers directory	2009-02-05 15:08:53 +01:00
ac97_bus.c	ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration	2008-12-02 16:25:37 +01:00
last.c	…
sound_core.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
sound_firmware.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00