projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7491612 c36f74e)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Feb 2010 15:09:54 +0000 (07:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Feb 2010 15:09:54 +0000 (07:09 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  netlabel: fix export of SELinux categories > 127


Trivial merge
John Crispins staging tree