Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 6e158d21
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)
      pxa168_eth: fix race in transmit path.
      ipv4, ping: Remove duplicate icmp.h include
      netxen: fix race in skb->len access
      sgi-xp: fix a use after free
      hp100: fix an skb->len race
      netpoll: copy dev name of slaves to struct netpoll
      ipv4: fix multicast losses
      r8169: fix static initializers.
      inet_diag: fix inet_diag_bc_audit()
      gigaset: call module_put before restart of if_open()
      farsync: add module_put to error path in fst_open()
      net: rfs: enable RFS before first data packet is received
      fs_enet: fix freescale FCC ethernet dp buffer alignment
      netdev: bfin_mac: fix memory leak when freeing dma descriptors
      vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support
      caif: Bugfix - XOFF removed channel from caif-mux
      tun: teach the tun/tap driver to support netpoll
      dp83640: drop PHY status frames in the driver.
      dp83640: fix phy status frame event parsing
      phylib: Allow BCM63XX PHY to be selected only on BCM63XX.
      ...
    6e158d21