Merge branch 'next-evm' of git://github.com/mzohar/linux-evm into next
authorJames Morris <jmorris@namei.org>
Wed, 14 Sep 2011 23:53:38 +0000 (09:53 +1000)
committerJames Morris <jmorris@namei.org>
Wed, 14 Sep 2011 23:53:38 +0000 (09:53 +1000)

Trivial merge