aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2016-01-14 12:11:58 +1100
committerJames Morris <james.l.morris@oracle.com>2016-01-14 12:11:58 +1100
commitacb2cfdb316ddc3fac8183c0f71edd1680713b10 (patch)
treece94b3236d6b60dc67334ad30e938b8fd8ad80de /security/keys
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into ra-next (diff)
parentselinux: Inode label revalidation performance fix (diff)
downloadlinux-dev-acb2cfdb316ddc3fac8183c0f71edd1680713b10.tar.xz
linux-dev-acb2cfdb316ddc3fac8183c0f71edd1680713b10.zip
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/keys')
0 files changed, 0 insertions, 0 deletions