diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-30 11:12:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-30 11:12:20 -0700 |
| commit | b822cb187d6c62d6de0a7a8cfd7bd76234cecdd6 (patch) | |
| tree | f25714f9060575f99c554dcbc032c84dbbd4eb4f /kernel | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | apparmor: fix suspicious RCU usage warning in policy.c/policy.h (diff) | |
| download | linux-dev-b822cb187d6c62d6de0a7a8cfd7bd76234cecdd6.tar.xz linux-dev-b822cb187d6c62d6de0a7a8cfd7bd76234cecdd6.zip | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions