projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86d4325 095b850)
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)
* 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


Trivial merge
John Crispins staging tree