| commit | a47c7a6c8aff0563c0ef4adf299268f3c27af0f6 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Oct 22 11:17:50 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Oct 22 11:17:50 2015 +1100 |
| tree | 0b9233d8daac506b094307683fe27edba0a1f00d | |
| parent | 083c1290ca73666ce1b551cc89d080d060f02ad6 [diff] | |
| parent | 63205654c0e05e5ffa1c6eef2fbef21dcabd2185 [diff] |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next