Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds authored
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  b44: Use kernel DMA addresses for the kernel DMA API
  forcedeth: Fix resume from hibernation regression.
  xfrm: fix fragmentation on inter family tunnels
  ibm_newemac: Fix dangerous struct assumption
  gigaset: documentation update
  gigaset: in file ops, check for device disconnect before anything else
  bas_gigaset: use tasklet_hi_schedule for timing critical tasklets
  net/802/fddi.c: add MODULE_LICENSE
  smsc911x: remove unused #include <linux/version.h>
  axnet_cs: fix phy_id detection for bogus Asix chip.
  bnx2: Use request_firmware()
  b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()
  socket: use percpu_add() while updating sockets_in_use
  virtio_net: Set the mac config only when VIRITO_NET_F_MAC
  myri_sbus: use request_firmware
  e1000: fix loss of multicast packets
  vxge: should include tcp.h

Conflict in firmware/WHENCE (SCSI vs net firmware)
39892032
Name Last commit Last update
..
3com 3C359: use request_firmware
acenic firmware: convert acenic driver to request_firmware()
adaptec starfire: use request_firmware()
advansys [SCSI] advansys: use request_firmware
bnx2 bnx2: Use request_firmware()
cpia2 cpia2: use request_firmware()
cxgb3 cxgb3: update FW
dabusb dabusb: use request_firmware()
dsp56k make firmware/dsp56k/bootstrap.asm buildable on a56
e100 firmware: convert e100 driver to request_firmware()
edgeport edgeport-ti: use request_firmware()
emi26 emi26: use request_firmware()
emi62 emi62: use request_firmware()
ess firmware: convert maestro3 driver to use firmware loader exclusively
kaweth kaweth: use request_firmware()
keyspan keyspan: use request_firmware()
keyspan_pda keyspan_pda: use request_firmware()
korg firmware: convert korg1212 driver to use firmware loader exclusively
myricom myri_sbus: use request_firmware
ositech smc91c92_cs: use request_firmware
qlogic [SCSI] qlogicpti: use request_firmware
sb16 firmware: convert sb16_csp driver to use firmware loader exclusively
slicoss Staging: slicoss: add binary firmware to firmware directory
sun cassini: use request_firmware
sxg Staging: sxg: Add support to download the firmware using request_firmware()
tehuti
tigon
ttusb-budget
vicam
yam
yamaha
.gitignore
Makefile
WHENCE
atmsar11.HEX
intelliport2.bin.ihex
mts_cdma.fw.ihex
mts_edge.fw.ihex
mts_gsm.fw.ihex
ti_3410.fw.ihex
ti_5052.fw.ihex
tr_smctr.bin.ihex
whiteheat.HEX
whiteheat_loader.HEX
whiteheat_loader_debug.HEX