Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
authorJames Morris <jmorris@namei.org>
Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 9 Jan 2011 23:40:42 +0000 (10:40 +1100)

Trivial merge