tree d0796f172c096147e1a7c0337279bf7dca6f13f2
parent b25b09ecf98bf6a32f3732281c2db13be6aeb14c
parent 8606404fa555c2ee691376fcc640ab89fe752035
author James Morris <james.l.morris@oracle.com> 1347419797 +1000
committer James Morris <james.l.morris@oracle.com> 1347419797 +1000

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.