summaryrefslogtreecommitdiffstats
path: root/security/smack
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-08-06 00:52:01 +1000
committerJames Morris <james.l.morris@oracle.com>2014-08-06 00:52:01 +1000
commit478d085524c57cf4283699f529d5a4c22188ea69 (patch)
treee97cdfff78867f247871be7f89341f087c766311 /security/smack
parent103ae675b12dee75ec099abf3d22857d1384b3bc (diff)
parentcf5b50fd2d70fdd907d433bcebaf8d89a9490334 (diff)
downloadlinux-478d085524c57cf4283699f529d5a4c22188ea69.tar.bz2
Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions