From: Linus Torvalds Date: Mon, 14 Jul 2008 23:54:07 +0000 (-0700) Subject: Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6 X-Git-Tag: v2.6.27-rc1~1094 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5a86102248592e178a9023359ccf7f0e489d8e35;p=linux-2.6-omap-h63xx.git 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. --- 5a86102248592e178a9023359ccf7f0e489d8e35 diff --cc drivers/char/dsp56k.c index 7bf7485377e,d716c78f0ff..b9a30c30e2b --- a/drivers/char/dsp56k.c +++ b/drivers/char/dsp56k.c @@@ -33,7 -33,8 +33,9 @@@ #include #include #include +#include + #include + #include #include #include diff --cc drivers/char/ip2/ip2main.c index 61b6fe4156b,e19df02ec86..9a2394cda94 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c @@@ -98,7 -98,8 +98,9 @@@ #include #include #include +#include + #include + #include #include #include