• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · c3da3148
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
      vmxnet: fix 2 build problems
      net: add support for STMicroelectronics Ethernet controllers.
      net: ks8851_mll uses mii interfaces
      net/fec_mpc52xx: Fix kernel panic on FEC error
      net: Fix OF platform drivers coldplug/hotplug when compiled as modules
      TI DaVinci EMAC: Clear statistics register properly.
      r8169: partial support and phy init for the 8168d
      irda/sa1100_ir: check return value of startup hook
      udp: Fix udp_poll() and ioctl()
      WAN: fix Cisco HDLC handshaking.
      tcp: fix tcp_defer_accept to consider the timeout
      3c574_cs: spin_lock the set_multicast_list function
      net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs
      netxen: fix pci bar mapping
      ethoc: fix warning from 32bit build
      libertas: fix build
      net: VMware virtual Ethernet NIC driver: vmxnet3
      net: Fix IXP 2000 network driver building.
      libertas: fix build
      mac80211: document ieee80211_rx() context requirement
      ...
    c3da3148
ethoc.c 27 KB