• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 09ce42d3
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6:
      bnx2: Fix the behavior of ethtool when ONBOOT=no
      qla3xxx: Don't sleep while holding lock.
      qla3xxx: Give the PHY time to come out of reset.
      ipv4 routing: Ensure that route cache entries are usable and reclaimable with caching is off
      net: Move rx skb_orphan call to where needed
      ipv6: Use correct data types for ICMPv6 type and code
      net: let KS8842 driver depend on HAS_IOMEM
      can: let SJA1000 driver depend on HAS_IOMEM
      netxen: fix firmware init handshake
      netxen: fix build with without CONFIG_PM
      netfilter: xt_rateest: fix comparison with self
      netfilter: xt_quota: fix incomplete initialization
      netfilter: nf_log: fix direct userspace memory access in proc handler
      netfilter: fix some sparse endianess warnings
      netfilter: nf_conntrack: fix conntrack lookup race
      netfilter: nf_conntrack: fix confirmation race condition
      netfilter: nf_conntrack: death_by_timeout() fix
    09ce42d3
sock.h 43.1 KB