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)
commitdbd004291ed31db280a3f2d7a1113a04e5e85af4
tree2527346fca970d3bd7187f3848e0b6cdef933f3e
parent7491612c7d2cf560bb96dc02bb53d555b41adbb8
parentc36f74e67fa12202dbcb4ad92c5ac844f9d36b98
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  netlabel: fix export of SELinux categories > 127