projects / linux-flexiantxendom0-natty.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f90933 a26d279)
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)
* '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()


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu Natty kernel