Merge branch 'stable-4.12' of git://git.infradead.org/users/pcmoore/selinux into...
authorJames Morris <james.l.morris@oracle.com>
Tue, 18 Apr 2017 22:30:08 +0000 (08:30 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 18 Apr 2017 22:30:08 +0000 (08:30 +1000)

Trivial merge