Skip to content
Snippets Groups Projects
  • Linus Torvalds's avatar
    c5e6fd28
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · c5e6fd28
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits)
      vlan: Use bitmask of feature flags instead of seperate feature bits
      fmvj18x_cs: add NextCom NC5310 rev B support
      xirc2ps_cs: re-initialize the multicast address in do_reset
      3C509: rx_bytes should not be increased when alloc_skb failed
      NETFRONT: Use __skb_queue_purge()
      VIRTIO: Use __skb_queue_purge()
      phylib: do EXPORT_SYMBOL on get_phy_id
      netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
      WAN: protect HDLC proto list while insmod/rmmod
      drivers/net/fs_enet: remove null pointer dereference
      S2io: Version update for napi and MSI-X patches
      S2io: Added napi support when MSIX is enabled.
      S2io: Move all the transmit completions to a single msi-x (alarm) vector
      drivers/net/ehea - remove unnecessary memset after kzalloc
      au1000_eth: remove useless check
      Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>
      cpmac bugfixes and enhancements
      e1000e: use resource_size_t, not unsigned long, for phys addrs
      net/usb: add support for Apple USB Ethernet Adapter
      uli526x: add support for netpoll
      ...
    c5e6fd28
    History
    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: (52 commits)
      vlan: Use bitmask of feature flags instead of seperate feature bits
      fmvj18x_cs: add NextCom NC5310 rev B support
      xirc2ps_cs: re-initialize the multicast address in do_reset
      3C509: rx_bytes should not be increased when alloc_skb failed
      NETFRONT: Use __skb_queue_purge()
      VIRTIO: Use __skb_queue_purge()
      phylib: do EXPORT_SYMBOL on get_phy_id
      netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
      WAN: protect HDLC proto list while insmod/rmmod
      drivers/net/fs_enet: remove null pointer dereference
      S2io: Version update for napi and MSI-X patches
      S2io: Added napi support when MSIX is enabled.
      S2io: Move all the transmit completions to a single msi-x (alarm) vector
      drivers/net/ehea - remove unnecessary memset after kzalloc
      au1000_eth: remove useless check
      Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>
      cpmac bugfixes and enhancements
      e1000e: use resource_size_t, not unsigned long, for phys addrs
      net/usb: add support for Apple USB Ethernet Adapter
      uli526x: add support for netpoll
      ...