| commit | 641628146c1986c966ae030e65bb6f30feef0fd0 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Fri Mar 27 20:33:27 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Fri Mar 27 20:33:27 2015 +1100 |
| tree | f26a935d0760d20b4f5cdaefbc4c6e2a49e62a94 | |
| parent | 3c435c1e472ba344ee25f795f4807d4457e61f6c [diff] | |
| parent | 6436a123a147db51a0b06024a8350f4c230e73ff [diff] |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus