]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Mar 2012 21:26:19 +0000 (14:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Mar 2012 21:26:19 +0000 (14:26 -0700)
commit815908d3b1372ff62abc3856549901c25e2155a2
tree5efaa76d16915feea9241966a90ab93fa4d71397
parent637ffa005722c39ee31f557740f9a9f1821caa34
parentaee11d55a6454b5500bcacf1b793a6ba0eee0b91
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull an Apparmor bugfix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: Fix change_onexec when called from a confined task