Merge branch 'for-Linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Mon, 7 Jan 2013 01:11:37 +0000 (12:11 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 7 Jan 2013 01:11:37 +0000 (12:11 +1100)
commitade24c93ab173b392a905ef8d510874dfb05a417
treef984a9b428cdf1866566cf9dba808d8fcc60d468
parent5f243b9b46a22e5790dbbc36f574c2417af49a41
parenta7f2a366f62319dfebf8d4dfe8b211f631c78457
Merge branch 'for-Linus' of git://git./linux/kernel/git/zohar/linux-integrity into for-linus

Pulled from Mimi's tree.