Merge branch 'stable-4.6' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 4 Mar 2016 00:39:05 +0000 (11:39 +1100)
committerJames Morris <james.l.morris@oracle.com>
Fri, 4 Mar 2016 00:39:05 +0000 (11:39 +1100)

Trivial merge