Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 22 Oct 2015 00:17:50 +0000 (11:17 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 22 Oct 2015 00:17:50 +0000 (11:17 +1100)

Trivial merge