]> err.no Git - linux-2.6/commit
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Jul 2008 23:54:07 +0000 (16:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Jul 2008 23:54:07 +0000 (16:54 -0700)
commit5a86102248592e178a9023359ccf7f0e489d8e35
tree9e5fdb9aafca687fa412f7c034f2cfbb834b8567
parent85082fd7cbe3173198aac0eb5e85ab1edcc6352c
parent751851af7aae9b8bd5a60b3897209081fbc18b2b
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.
Makefile
arch/x86/kernel/microcode.c
drivers/char/dsp56k.c
drivers/char/ip2/ip2main.c
include/asm-generic/vmlinux.lds.h