tree 524b78f3a5a9c35bee8b437e9c4738d42fc454a7
parent 0f90933c477c061df6daf42d814ff2012aea43cc
parent a26d279ea87e9fef2cf8a44b371e48e6091975a6
author Linus Torvalds <torvalds@linux-foundation.org> 1289577625 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289577625 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()