Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 14 Jan 2016 01:11:58 +0000 (12:11 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 14 Jan 2016 01:11:58 +0000 (12:11 +1100)

Trivial merge