From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 27 Jan 2007 03:39:40 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.20-rc7~51
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d620a4e531ae4d432d3c88f7d4b75327d881a87;p=linux-2.6

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
---

7d620a4e531ae4d432d3c88f7d4b75327d881a87