| commit | acb2cfdb316ddc3fac8183c0f71edd1680713b10 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Jan 14 12:11:58 2016 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Jan 14 12:11:58 2016 +1100 |
| tree | ce94b3236d6b60dc67334ad30e938b8fd8ad80de | |
| parent | 607259e17b37017e9ec0249a8b0a7d8b76b572aa [diff] | |
| parent | b197367ed1ba81b0d26f7e7f76f61731ac6e5842 [diff] |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next