Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 402168ce
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
      sky2: Avoid races in sky2_down
      drivers/net/mlx4: Adjust constant
      drivers/net: Move a dereference below a NULL test
      drivers/net: Move a dereference below a NULL test
      connector: maintainer/mail update.
      USB host CDC Phonet network interface driver
      macsonic, jazzsonic: fix oops on module unload
      macsonic: move probe function to .devinit.text
      can: switch carrier on if device was stopped while in bus-off state
      can: restart device even if dev_alloc_skb() fails
      can: sja1000: remove duplicated includes
      New device ID for sc92031 [1088:2031]
      3c589_cs: re-initialize the multicast in the tc589_reset
      Fix error return for setsockopt(SO_TIMESTAMPING)
      netxen: fix thermal check and shutdown
      netxen: fix deadlock on dev close
      netxen: fix context deletion sequence
      net: Micrel KS8851 SPI network driver
      tcp: Use correct peer adr when copying MD5 keys
      tcp: Fix MD5 signature checking on IPv4 mapped sockets
      ...
    402168ce