| commit | 37babe4ec610ff288a60aa79619b3d2f00bcfd89 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Sat Dec 26 16:07:31 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Sat Dec 26 16:07:31 2015 +1100 |
| tree | a3f76e129675a77c560f118e0b12f525fb06f144 | |
| parent | 3cb92fe48138d225b8d0ceedf148642f9103f841 [diff] | |
| parent | 76319946f321e30872dd72af7de867cb26e7a373 [diff] |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next