Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Aug 2009 02:25:00 +0000 (19:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Aug 2009 02:25:00 +0000 (19:25 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  SELinux: fix memory leakage in /security/selinux/hooks.c


Trivial merge