| commit | 923b49ff69fcbffe6f8b2739de218c45544392a7 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Wed Jan 08 17:22:32 2014 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Wed Jan 08 17:22:32 2014 +1100 |
| tree | 44d03d61cad1edd916e5e0d88641353aa7cd0d4c | |
| parent | d4a82a4a033d563f1dc2c944eec2358cb38432d0 [diff] | |
| parent | 8ed814602876bec9bad2649ca17f34b499357a1c [diff] |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next