diff options
| author | Linus Torvalds | 2008-07-15 01:54:07 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-07-15 01:54:07 +0200 |
| commit | 5a86102248592e178a9023359ccf7f0e489d8e35 (patch) | |
| tree | 9e5fdb9aafca687fa412f7c034f2cfbb834b8567 /drivers/net/tun.c | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff) | |
| download | kernel-qcow2-linux-5a86102248592e178a9023359ccf7f0e489d8e35.tar.gz kernel-qcow2-linux-5a86102248592e178a9023359ccf7f0e489d8e35.tar.xz kernel-qcow2-linux-5a86102248592e178a9023359ccf7f0e489d8e35.zip | |
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.
Diffstat (limited to 'drivers/net/tun.c')
0 files changed, 0 insertions, 0 deletions