tree fe4b226f695394383e546683755ebda9f37ac7b2
parent 86d43258bcad2068744c85181b97bb35ab27a74d
parent 095b8501e4168ae5a879fcb9420ac48cbd43f95a
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1169869180 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1169869180 -0800

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