Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJames Morris <jmorris@namei.org>
Fri, 18 Nov 2011 00:17:23 +0000 (11:17 +1100)
committerJames Morris <jmorris@namei.org>
Fri, 18 Nov 2011 00:17:23 +0000 (11:17 +1100)
commitb85c804d5ad48f239871b95afbddd84422e06f25
treeb78af4d780dc7eec0c7b866194385150e6b29500
parentfe8a0df46e5076429872887b467c538bc9c0c738
parent9c69898783a0121399ec078d40d4ccc00e3cb0df
Merge branch 'encrypted-key-fixes' of git://git./linux/kernel/git/zohar/linux-integrity into for-linus