diff options
author | James Morris <jmorris@namei.org> | 2010-03-31 08:39:27 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-03-31 08:39:27 +1100 |
commit | d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec (patch) | |
tree | 7362b182dedd825fc762ef7706830837e42943af /security/selinux/netlabel.c | |
parent | TPM: workaround to enforce PCR updates across suspends (diff) | |
parent | Linux 2.6.34-rc3 (diff) | |
download | linux-dev-d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec.tar.xz linux-dev-d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec.zip |
Merge branch 'master' into next
Diffstat (limited to 'security/selinux/netlabel.c')
0 files changed, 0 insertions, 0 deletions