Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...
authorJames Morris <james.l.morris@oracle.com>
Thu, 26 Nov 2015 04:04:19 +0000 (15:04 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 26 Nov 2015 04:04:19 +0000 (15:04 +1100)

Trivial merge