Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Nov 2010 16:00:25 +0000 (08:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Nov 2010 16:00:25 +0000 (08:00 -0800)
commitfe7e96f66b2622d8492ee9dd7fc08b811086caca
tree524b78f3a5a9c35bee8b437e9c4738d42fc454a7
parent0f90933c477c061df6daf42d814ff2012aea43cc
parenta26d279ea87e9fef2cf8a44b371e48e6091975a6
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:
  APPARMOR: Fix memory leak of apparmor_init()
  APPARMOR: Fix memory leak of alloc_namespace()