Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Sep 2008 00:57:55 +0000 (17:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Sep 2008 00:57:55 +0000 (17:57 -0700)
commitd210baf53b699fc61aa891c177b71d7082d3b957
tree5fafeb7e9198927f15006d93af734f754880adc0
parent3e25a2d90e7e303168540c5ecb726297940cb172
parent8e531af90f3940615623dc0aa6c94866a6773601
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:
  SELinux: memory leak in security_context_to_sid_core