diff options
author | Paul Moore <pmoore@redhat.com> | 2014-01-23 21:52:06 +0100 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2014-01-23 21:52:06 +0100 |
commit | 41be702a542a0d14bb0b1c16e824fa9ed27616ec (patch) | |
tree | e48942a05882da47544e179c6a0c920e00137a6a /samples/kobject/kset-example.c | |
parent | SELinux: Fix memory leak upon loading policy (diff) | |
parent | Linux 3.13 (diff) | |
download | linux-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.xz linux-41be702a542a0d14bb0b1c16e824fa9ed27616ec.zip |
Merge tag 'v3.13' into next
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'samples/kobject/kset-example.c')
0 files changed, 0 insertions, 0 deletions