diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-09-12 13:16:37 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-09-12 13:16:37 +1000 |
| commit | 9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252 (patch) | |
| tree | d0796f172c096147e1a7c0337279bf7dca6f13f2 /drivers/char/tpm | |
| parent | b25b09ecf98bf6a32f3732281c2db13be6aeb14c (diff) | |
| parent | 8606404fa555c2ee691376fcc640ab89fe752035 (diff) | |
Merge branch 'next-ima-appraisal' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
As requested by Mimi, this adds the IMA Appraisal feature.
Diffstat (limited to 'drivers/char/tpm')
0 files changed, 0 insertions, 0 deletions