• Linus Torvalds's avatar
    Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 152a6a9d
    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
      [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
      [IPV4] SNMP: Support InMcastPkts and InBcastPkts
      [IPV4] SNMP: Support InTruncatedPkts
      [IPV4] SNMP: Support InNoRoutes
      [SNMP]: Add definitions for {In,Out}BcastPkts
      [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
      [TCP] FRTO: Delay skb available check until it's mandatory
      [XFRM]: Restrict upper layer information by bundle.
      [TCP]: Catch skb with S+L bugs earlier
      [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
      [L2TP]: Add the ability to autoload a pppox protocol module.
      [SKB]: Introduce skb_queue_walk_safe()
      [AF_IUCV/IUCV]: smp_call_function deadlock
      [IPV6]: Fix slab corruption running ip6sic
      [TCP]: Update references in two old comments
      [XFRM]: Export SPD info
      [IPV6]: Track device renames in snmp6.
      [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
      [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
      [NETPOLL]: Remove CONFIG_NETPOLL_RX
      ...
    152a6a9d
Kconfig 101 KB