Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Fri, 12 Sep 2014 12:40:22 +0000 (22:40 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 12 Sep 2014 12:40:22 +0000 (22:40 +1000)
commitac60ab4b4968b54fb5af20eac9dd78e36ad910c1
treea47e414fb34d91eb012b121d8138c6cee1fe065b
parenta0cfd75fdc46b56978ece383a7d6f6b04e9087ad
parenta2d61ed525f3458a913147fd02b1a5cf15e7551b
Merge branch 'next' of git://git./linux/kernel/git/zohar/linux-integrity into next