Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Sat, 26 Dec 2015 05:07:31 +0000 (16:07 +1100)
committerJames Morris <james.l.morris@oracle.com>
Sat, 26 Dec 2015 05:07:31 +0000 (16:07 +1100)
commit37babe4ec610ff288a60aa79619b3d2f00bcfd89
treea3f76e129675a77c560f118e0b12f525fb06f144
parent3cb92fe48138d225b8d0ceedf148642f9103f841
parent76319946f321e30872dd72af7de867cb26e7a373
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next