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
..
oss	ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation	2010-11-30 08:18:58 +01:00
seq	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
control_compat.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
control.c	ALSA: prevent heap corruption in snd_ctl_new()	2010-09-28 21:33:16 +02:00
device.c
hrtimer.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
hwdep_compat.c
hwdep.c
info_oss.c
info.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
init.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
isadma.c
jack.c	Merge branch 'topic/jack' into for-linus	2010-05-20 11:59:37 +02:00
Kconfig
Makefile
memalloc.c
memory.c
misc.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
pcm_compat.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
pcm_lib.c	ALSA: sound/core/pcm_lib.c: Remove unnecessary semicolons	2010-11-22 07:41:49 +01:00
pcm_memory.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
pcm_misc.c	ALSA: pcm: Define G723 3-bit and 5-bit formats	2010-05-31 09:10:03 +02:00
pcm_native.c	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
pcm_timer.c
pcm.c	Merge branch 'fix/misc' into topic/misc	2010-10-11 13:45:22 +02:00
rawmidi_compat.c
rawmidi.c	ALSA: rawmidi: fix oops (use after free) when unloading a driver module	2010-10-17 10:11:40 +02:00
rtctimer.c
sgbuf.c
sound_oss.c
sound.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
timer_compat.c
timer.c	Merge branch 'topic/core-cleanup' into for-linus	2010-05-20 11:58:57 +02:00
vmaster.c