]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f0fa0c7 1485d41)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Oct 2013 17:16:45 +0000 (10:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Oct 2013 17:16:45 +0000 (10:16 -0700)
commitbf00bc62bea8a83e7da12cf166058c75845761ff
tree8d71a2f8b0656481ef00c6087536dde6bd261e1etree | snapshot
parentf0fa0c7206208f08f95d2d614609d636cdcbd4c7commit | diff
parent1485d41de44e1c6005353f30da593192c517e9c2commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull apparmor fixes from James Morris:
 "A couple more regressions fixed"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix bad lock balance when introspecting policy
  apparmor: fix memleak of the profile hash
Linux Kernel Source Tree.