aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/keyring.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-05-22 11:21:06 +1000
committerJames Morris <james.l.morris@oracle.com>2012-05-22 11:21:06 +1000
commitff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch)
tree9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /security/keys/keyring.c
parentapparmor: fix long path failure due to disconnected path (diff)
parentSELinux: remove unused common_audit_data in flush_unauthorized_files (diff)
downloadlinux-dev-ff2bb047c4bce9742e94911eeb44b4d6ff4734ab.tar.xz
linux-dev-ff2bb047c4bce9742e94911eeb44b4d6ff4734ab.zip
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Per pull request, for 3.5.
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions