summaryrefslogtreecommitdiffstats
path: root/security/keys/keyctl.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-07-16 19:05:51 +0200
committerJames Morris <james.l.morris@oracle.com>2014-07-16 19:05:51 +0200
commitb6b8a371f5541c2b839caba84fede693f3fcc43d (patch)
tree8bee0d6e115133436a2a1781814cbc2e9f72629e /security/keys/keyctl.c
parentSync with the changes pushed by Serge in the last merge window. (diff)
parentselinux: fix the default socket labeling in sock_graft() (diff)
downloadlinux-b6b8a371f5541c2b839caba84fede693f3fcc43d.tar.xz
linux-b6b8a371f5541c2b839caba84fede693f3fcc43d.zip
Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/keys/keyctl.c')
0 files changed, 0 insertions, 0 deletions