Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
authorJames Morris <jmorris@namei.org>
Tue, 8 Mar 2011 00:38:10 +0000 (11:38 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 8 Mar 2011 00:38:10 +0000 (11:38 +1100)

Trivial merge