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
..
ac97	ALSA: ac97 - fix patch_ucb1400 for proper resume	2008-07-10 09:32:07 +02:00
ali5451
au88x0
aw2	ALSA: aw2 - Fix Oops at initialization	2008-06-23 12:06:23 +02:00
ca0106	ALSA: ca0106 - Add entry for another MSI K8N Diamond MB	2008-06-18 09:31:59 +02:00
cs46xx
cs5535audio
echoaudio
emu10k1	ALSA: emu10k1 - simplify the last fix	2008-06-17 16:30:27 +02:00
hda	ALSA: hda - Fix FSC V5505 model	2008-07-14 09:00:51 +02:00
ice1712
korg1212	firmware: convert korg1212 driver to use firmware loader exclusively	2008-07-10 14:47:44 +01:00
mixart	Fix a const pointer usage warning in the Digigram miXart soundcard driver	2008-07-10 14:29:01 +01:00
nm256	ALSA: correct kcalloc usage	2008-07-14 09:01:09 +02:00
oxygen
pcxhr	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
riptide	riptide: treat firmware data as const	2008-07-10 14:26:07 +01:00
rme9652
trident	ALSA: trident - pause s/pdif output	2008-06-26 09:01:38 +02:00
vx222	vx222: treat firmware data as const	2008-07-10 14:26:06 +01:00
ymfpci	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
ad1889.c
ad1889.h
ak4531_codec.c
als300.c
als4000.c
atiixp.c
atiixp_modem.c
azt3328.c	ALSA: PCI168 snd-azt3328: some more fixups	2008-06-26 09:01:47 +02:00
azt3328.h	ALSA: PCI168 snd-azt3328: some more fixups	2008-06-26 09:01:47 +02:00
bt87x.c
cmipci.c
cs4281.c
cs5530.c
ens1370.c
ens1371.c
es1938.c
es1968.c
fm801.c
intel8x0.c
intel8x0m.c
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
maestro3.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
Makefile
rme32.c
rme96.c
sis7019.c
sis7019.h
sonicvibes.c
via82xx.c	ALSA: via82xx - Add VIA audio device #1841 to ac97_quirk list	2008-07-10 09:31:17 +02:00
via82xx_modem.c