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

..

emu8000_callback.c

…

emu8000_local.h

…

emu8000_patch.c

…

emu8000_pcm.c

…

emu8000_synth.c

…

emu8000.c

…

es968.c

…

Makefile

…

sb8_main.c

…

sb8_midi.c

…

sb8.c

…

sb16_csp.c

firmware: convert sb16_csp driver to use firmware loader exclusively

2008-07-14 14:45:46 -07:00

sb16_main.c

…

sb16.c

…

sb_common.c

…

sb_mixer.c

ALSA: sb - Fix wrong assertions

2008-06-23 12:06:23 +02:00

sbawe.c

…