Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 02:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
ebbdbd7c02
linux/sound
History
Linus Torvalds 5a86102248 Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6 
* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
  firmware: convert sb16_csp driver to use firmware loader exclusively
  dsp56k: use request_firmware
  edgeport-ti: use request_firmware()
  edgeport: use request_firmware()
  vicam: use request_firmware()
  dabusb: use request_firmware()
  cpia2: use request_firmware()
  ip2: use request_firmware()
  firmware: convert Ambassador ATM driver to request_firmware()
  whiteheat: use request_firmware()
  ti_usb_3410_5052: use request_firmware()
  emi62: use request_firmware()
  emi26: use request_firmware()
  keyspan_pda: use request_firmware()
  keyspan: use request_firmware()
  ttusb-budget: use request_firmware()
  kaweth: use request_firmware()
  smctr: use request_firmware()
  firmware: convert ymfpci driver to use firmware loader exclusively
  firmware: convert maestro3 driver to use firmware loader exclusively
  ...

Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
drivers/char/ip2/ip2main.c manually.
2008-07-14 16:54:07 -07:00
..
aoa sound: Convert to menuconfig 2008-05-27 15:56:20 +02:00
arm sound: Convert to menuconfig 2008-05-27 15:56:20 +02:00
core Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6 2008-07-14 14:48:31 -07:00
drivers Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 2008-07-14 15:51:11 -07:00
i2c [ALSA] remove CVS keywords 2008-05-27 15:56:20 +02:00
isa Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 2008-07-14 15:51:11 -07:00
mips ALSA: ALSA driver for SGI O2 audio board 2008-07-14 09:01:02 +02:00
oss Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2008-07-14 13:43:24 -07:00
parisc sound: Convert to menuconfig 2008-05-27 15:56:20 +02:00
pci Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 2008-07-14 15:51:11 -07:00
pcmcia ALSA: Fix a const to non-const assignment in the Digigram VXpocket sound driver 2008-07-10 09:32:57 +02:00
ppc ALSA: remove CONFIG_KMOD from sound 2008-07-10 09:32:58 +02:00
sh sound: Convert to menuconfig 2008-05-27 15:56:20 +02:00
soc Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-07-14 16:06:58 -07:00
sparc ALSA: make sparc/dbri.c:snd_dbri_proc() static 2008-06-06 11:55:05 +02:00
spi sound: Convert to menuconfig 2008-05-27 15:56:20 +02:00
synth [ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event 2008-05-13 14:47:43 +02:00
usb ALSA: usb-audio: add some Yamaha USB MIDI quirks 2008-07-10 11:05:42 +02:00
ac97_bus.c
Kconfig sound: Convert to menuconfig 2008-05-27 15:56:20 +02:00
last.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
Makefile [ALSA] Add SPI devices to ALSA Kconfig and Makefile 2007-10-16 15:57:47 +02:00
sound_core.c sound: cdev lock_kernel() pushdown 2008-06-20 14:05:50 -06:00
sound_firmware.c Detach sched.h from mm.h 2007-05-21 09:18:19 -07:00