]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf8fed7 3a1e3fd)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 14 May 2007 19:28:11 +0000 (12:28 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 14 May 2007 19:28:11 +0000 (12:28 -0700)
commita14ea0d1ddf97155ad5e1920e6181583f7edeb54
tree8f7513bd35225f8681cd7d214d807b7e26211afatree | snapshot
parentbf8fed7bd04001a7674f6e4c02743111f84cb00fcommit | diff
parent3a1e3fd93489b15378b12cf789af589f2af1df48commit | diff
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
Linux Kernel Source Tree.