Merge branch 'evm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kasatkin...
authorJames Morris <jmorris@namei.org>
Wed, 21 Dec 2011 00:28:16 +0000 (11:28 +1100)
committerJames Morris <jmorris@namei.org>
Wed, 21 Dec 2011 00:28:16 +0000 (11:28 +1100)

Trivial merge