David Woodhouse 751851af7a Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Conflicts: sound/pci/Kconfig		2008-07-14 15:51:11 -07:00
..
mpu401	[ALSA] Add MPU401_INFO_NO_ACK bitflag	2008-04-29 19:01:56 +02:00
opl3
opl4
pcsp	[ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number	2008-05-25 18:21:10 +02:00
vx	Fix a const pointer usage warning in the Digigram VX soundcard driver	2008-07-10 14:27:11 +01:00
dummy.c	[ALSA] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check	2008-04-24 12:00:38 +02:00
Kconfig	[ALSA] Fix AC97 kconfig items	2008-05-27 15:56:20 +02:00
Makefile
ml403-ac97cr.c	[ALSA] sound: fix platform driver hotplug/coldplug	2008-04-24 12:00:35 +02:00
mtpav.c
mts64.c
pcm-indirect2.c
pcm-indirect2.h
portman2x4.c
serial-u16550.c
virmidi.c