]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 27 Jan 2007 03:39:40 +0000 (19:39 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 27 Jan 2007 03:39:40 +0000 (19:39 -0800)
commite30e43e984cd529f787294eabde97e6e29918c6d
treefe4b226f695394383e546683755ebda9f37ac7b2
parent1f04ebba769e512f5a361e7d12b4423e1bc7597b
parentb4aef721e4fc101fdfb7e411bc66bbc68f978734
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