Merge branch 'next-ima-appraisal' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJames Morris <james.l.morris@oracle.com>
Wed, 12 Sep 2012 03:16:37 +0000 (13:16 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 12 Sep 2012 03:16:37 +0000 (13:16 +1000)
commit9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252
treed0796f172c096147e1a7c0337279bf7dca6f13f2
parentb25b09ecf98bf6a32f3732281c2db13be6aeb14c
parent8606404fa555c2ee691376fcc640ab89fe752035
Merge branch 'next-ima-appraisal' of git://git./linux/kernel/git/zohar/linux-integrity into next

As requested by Mimi, this adds the IMA Appraisal feature.