From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Nov 2010 16:00:25 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: Ubuntu-5.0.0-8.9~21086
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fe7e96f66b2622d8492ee9dd7fc08b811086caca;p=mirror_ubuntu-disco-kernel.git

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()
---

fe7e96f66b2622d8492ee9dd7fc08b811086caca