• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 39892032
    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
Makefile 9.66 KB