tree 2527346fca970d3bd7187f3848e0b6cdef933f3e
parent 7491612c7d2cf560bb96dc02bb53d555b41adbb8
parent c36f74e67fa12202dbcb4ad92c5ac844f9d36b98
author Linus Torvalds <torvalds@linux-foundation.org> 1267110594 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267110594 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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