Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Sat, 15 Aug 2015 03:29:57 +0000 (13:29 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sat, 15 Aug 2015 03:29:57 +0000 (13:29 +1000)

Trivial merge