diff options
author | James Morris <james.l.morris@oracle.com> | 2014-10-29 15:03:54 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-10-29 15:03:54 +1100 |
commit | 6c880ad51b829006c5387df88967954c0e874993 (patch) | |
tree | 3a164ed2e33c874be7dbe4783037985996ac9efc /security/integrity/ima/ima_template_lib.h | |
parent | 9f76628da20f96a179ca62b504886f99ecc29223 (diff) | |
parent | 3b1deef6b1289a99505858a3b212c5b50adf0c2f (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
Diffstat (limited to 'security/integrity/ima/ima_template_lib.h')
0 files changed, 0 insertions, 0 deletions