| commit | b2118ea97113de62ca5e19c1d92cf9c2966c45e8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 17 10:16:45 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 17 10:16:45 2013 -0700 |
| tree | 8d71a2f8b0656481ef00c6087536dde6bd261e1e | |
| parent | 056cdce0d3a214158f3a4ea40887b22639f855a8 [diff] | |
| parent | ed2c7da3a40c58410508fe24e12d03e508d7ec01 [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