Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 22 May 2012 01:21:06 +0000 (11:21 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 22 May 2012 01:21:06 +0000 (11:21 +1000)
Per pull request, for 3.5.


Trivial merge