Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 5 May 2016 23:31:34 +0000 (09:31 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 5 May 2016 23:31:34 +0000 (09:31 +1000)

Trivial merge