projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 29e0937 d831666)
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)
commit200cfbb36ce360f7943c62b6c09885c215bfc1f5
tree8f7513bd35225f8681cd7d214d807b7e26211afatree | snapshot
parent29e0937bb693879221f575b01f26314b3f443322commit | diff
parentd831666e98b4f1e19ebdd2349735f47bf37cd293commit | diff
Merge /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
Domain: System / Uncategorized;