Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4] SNMP: Display new statistics at /proc/net/netstat [IPV6]: Reverse sense of promisc tests in ip6_mc_input [NET_SCHED]: prio qdisc boundary condition [IPSEC]: Don't warn if high-order hash resize fails [IPSEC]: Check validity of direction in xfrm_policy_byid
Showing
- net/ipv4/proc.c 21 additions, 0 deletionsnet/ipv4/proc.c
- net/ipv6/ip6_input.c 1 addition, 1 deletionnet/ipv6/ip6_input.c
- net/sched/sch_prio.c 1 addition, 1 deletionnet/sched/sch_prio.c
- net/xfrm/xfrm_hash.c 2 additions, 1 deletionnet/xfrm/xfrm_hash.c
- net/xfrm/xfrm_policy.c 4 additions, 0 deletionsnet/xfrm/xfrm_policy.c
Loading
Please register or sign in to comment