Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (7d620a4e) · Commits · android / goshawk_kernel_oplus_sdm710

Commit 7d620a4e authored Jan 26, 2007 by Linus Torvalds

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]: Fix single-entry /proc/net/fib_trie output.
  [SELINUX]: Fix 2.6.20-rc6 build when no xfrm

parents 86d43258 095b8501

Hide whitespace changes

Inline Side-by-side

Please register or to comment