]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 056cdce ed2c7da)
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)
commitb2118ea97113de62ca5e19c1d92cf9c2966c45e8
tree8d71a2f8b0656481ef00c6087536dde6bd261e1etree | snapshot
parent056cdce0d3a214158f3a4ea40887b22639f855a8commit | diff
parented2c7da3a40c58410508fe24e12d03e508d7ec01commit | 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 for KaRo TX COM modules