| commit | 6e37592900f1e75c2031ec10886f4858a260aeec | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Nov 26 15:04:19 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Nov 26 15:04:19 2015 +1100 |
| tree | 6835898fc94ddcf1988e539da0270657739c836a | |
| parent | 096fe9eaea40a17e125569f9e657e34cdb6d73bd [diff] | |
| parent | f3bef67992e8698897b584616535803887c4a73e [diff] |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2