linux-sg2042/sound/core
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 ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
seq ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
Kconfig ALSA: Add a note on dependency of RTC stuff 2008-10-10 13:41:55 +02:00
Makefile ALSA: Build jack detection 2008-07-29 21:32:06 +02:00
control.c ALSA: use correct lock in snd_ctl_dev_disconnect() 2008-09-09 09:11:48 +02:00
control_compat.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
device.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
hwdep.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
hwdep_compat.c [PATCH] hwdep_compat missed __user annotations 2006-10-10 15:37:21 -07:00
info.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
info_oss.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
init.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
isadma.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
jack.c ALSA: Add jack reporting API 2008-07-29 21:32:03 +02:00
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 [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
misc.c [ALSA] sound: this amplifier only goes up to 7 2008-04-24 12:00:35 +02:00
pcm.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
pcm_compat.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
pcm_lib.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
pcm_memory.c ALSA: Allocate larger pages in sgbuf 2008-08-25 09:57:38 +02:00
pcm_misc.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
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 ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
rawmidi.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
rawmidi_compat.c [ALSA] Remove xxx_t typedefs: Raw MIDI 2006-01-03 12:17:35 +01:00
rtctimer.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
sgbuf.c ALSA: Allocate larger pages in sgbuf 2008-08-25 09:57:38 +02:00
sound.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
sound_oss.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
timer.c ALSA: fix a typo during snd_assert() removal 2008-08-15 11:48:04 +02:00
timer_compat.c ALSA: Kill snd_assert() in sound/core/* 2008-08-13 11:46:35 +02:00
vmaster.c [ALSA] Keep private TLV entry in vmaster itself 2008-04-24 12:00:12 +02:00