diff options
author | James Morris <james.l.morris@oracle.com> | 2014-07-16 19:05:51 +0200 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-07-16 19:05:51 +0200 |
commit | b6b8a371f5541c2b839caba84fede693f3fcc43d (patch) | |
tree | 8bee0d6e115133436a2a1781814cbc2e9f72629e /security/keys/keyctl.c | |
parent | Sync with the changes pushed by Serge in the last merge window. (diff) | |
parent | selinux: fix the default socket labeling in sock_graft() (diff) | |
download | linux-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