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)
* '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


Trivial merge