Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 30 Sep 2014 14:45:26 +0000 (00:45 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 30 Sep 2014 14:45:26 +0000 (00:45 +1000)

Trivial merge