| commit | b822cb187d6c62d6de0a7a8cfd7bd76234cecdd6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 30 11:12:20 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 30 11:12:20 2013 -0700 |
| tree | f25714f9060575f99c554dcbc032c84dbbd4eb4f | |
| parent | cbb16bec2d5bc5423f720e6aaed152de9be234ec [diff] | |
| parent | 4cd4fc77032dca46fe7475d81461e29145db247a [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull apparmor fixes from James Morris: "Bugfixes for the Apparmor code for regressions introduced in the 3.12 pull request" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: apparmor: fix suspicious RCU usage warning in policy.c/policy.h apparmor: Use shash crypto API interface for profile hashes