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)
commita47c7a6c8aff0563c0ef4adf299268f3c27af0f6
tree0b9233d8daac506b094307683fe27edba0a1f00d
parent083c1290ca73666ce1b551cc89d080d060f02ad6
parent63205654c0e05e5ffa1c6eef2fbef21dcabd2185
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next