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)
commit4d9c73f60efe7a76f086bc93f7ef22be9d78bed6
tree93b7ac2c680ea20dff76b23623606554a4b434e1
parent651b1f125c7e3806bbd635739d009433dc07372d
parent314dabb83a547ec4da819e8cbc78fac9cec605cd
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: fix memory leakage in /security/selinux/hooks.c