Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...
James Morris [Thu, 12 May 2011 23:52:16 +0000 (09:52 +1000)]

Trivial merge