David S. Miller 56c5d900db Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: sound/core/memalloc.c		2008-10-11 12:39:35 -07:00
..
oss	…
seq	…
Kconfig	ALSA: Add a note on dependency of RTC stuff	2008-10-10 13:41:55 +02:00
Makefile	…
control.c	ALSA: use correct lock in snd_ctl_dev_disconnect()	2008-09-09 09:11:48 +02:00
control_compat.c	…
device.c	…
hwdep.c	…
hwdep_compat.c	…
info.c	…
info_oss.c	…
init.c	…
isadma.c	…
jack.c	…
memalloc.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
memory.c	…
misc.c	…
pcm.c	…
pcm_compat.c	…
pcm_lib.c	…
pcm_memory.c	ALSA: Allocate larger pages in sgbuf	2008-08-25 09:57:38 +02:00
pcm_misc.c	…
pcm_native.c	ALSA: add dummy function to support shared mmap in nommu Blackfin arch	2008-09-04 11:06:34 +02:00
pcm_timer.c	…
rawmidi.c	…
rawmidi_compat.c	…
rtctimer.c	…
sgbuf.c	ALSA: Allocate larger pages in sgbuf	2008-08-25 09:57:38 +02:00
sound.c	…
sound_oss.c	…
timer.c	…
timer_compat.c	…
vmaster.c	…