From: James Morris <james.l.morris@oracle.com>
Date: Tue, 16 Dec 2014 01:49:10 +0000 (+1100)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~10957^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d0bffab0439fb7edaee09677b636eef5991e8b80;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'next' of git://git./linux/kernel/git/zohar/linux-integrity into for-linus
---

d0bffab0439fb7edaee09677b636eef5991e8b80