tree 0b9233d8daac506b094307683fe27edba0a1f00d
parent 083c1290ca73666ce1b551cc89d080d060f02ad6
parent 63205654c0e05e5ffa1c6eef2fbef21dcabd2185
author James Morris <james.l.morris@oracle.com> 1445473070 +1100
committer James Morris <james.l.morris@oracle.com> 1445473070 +1100

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next