linux_old1/sound/isa
Linus Torvalds 1e17d774db Merge git://git.infradead.org/~dwmw2/firmware-2.6
* git://git.infradead.org/~dwmw2/firmware-2.6:
  qla1280: Fix off-by-some error in firmware loading.
  Add README.AddingFirmware file. Basically telling people not to.
  firmware: Remove newly-added slicoss and sxg firmware images
  firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw
  ALSA: wavefront - Always use request_firmware()
  Remove fdump tool for av7110 firmware
  firmware: convert av7110 driver to request_firmware()
  Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
  Revert "fix modules_install via NFS"

Add-add conflicts in firmware/WHENCE fixed manually
2009-04-10 12:01:22 -07:00
..
ad1816a Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge 2009-02-16 23:03:57 +01:00
ad1848 ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
cs423x ALSA: cs4236 - Merge snd-cs4236-lib module into snd-cs4236 2009-02-17 08:10:54 +01:00
es1688 Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge 2009-02-16 23:03:57 +01:00
gus Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge 2009-02-16 23:03:57 +01:00
msnd ALSA: msnd - Fix build error with CONFIG_PNP=n 2009-02-04 18:28:42 +01:00
opti9xx Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge 2009-02-16 23:03:57 +01:00
sb Merge branch 'topic/isa-misc' into for-linus 2009-03-24 00:36:13 +01:00
wavefront ALSA: wavefront - Always use request_firmware() 2009-04-06 14:38:43 -07:00
wss Merge branch 'topic/sscape-fix' into for-linus 2009-03-24 00:36:21 +01:00
Kconfig ALSA: wavefront - Always use request_firmware() 2009-04-06 14:38:43 -07:00
Makefile ALSA: enable build of snd-msnd-* drivers 2009-01-28 09:02:52 +01:00
adlib.c ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
als100.c ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
azt2320.c ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
cmi8330.c Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge 2009-02-16 23:03:57 +01:00
dt019x.c ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
es18xx.c ALSA: Return proper error code at probe in sound/isa/* 2009-01-12 15:21:54 +01:00
opl3sa2.c ALSA: opl3sa2: add ZV port control 2009-04-06 03:46:17 +02:00
sc6000.c Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge 2009-02-16 23:03:57 +01:00
sgalaxy.c ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
sscape.c Merge branch 'topic/sscape-fix' into for-linus 2009-03-24 00:36:21 +01:00