Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit7d620a4e531ae4d432d3c88f7d4b75327d881a87
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 27 Jan 2007 03:39:40 +0000 (26 19:39 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 27 Jan 2007 03:39:40 +0000 (26 19:39 -0800)
treefe4b226f695394383e546683755ebda9f37ac7b2
parent86d43258bcad2068744c85181b97bb35ab27a74d
parent095b8501e4168ae5a879fcb9420ac48cbd43f95a
Merge /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