| commit | 103ae675b12dee75ec099abf3d22857d1384b3bc | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Sat Aug 02 22:58:02 2014 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Sat Aug 02 22:58:02 2014 +1000 |
| tree | a6b4f71bc911e7283b6573ee5833cd36a3ac2469 | |
| parent | a3d64df849bcb84220bf6db5773a10eee1fad4dc [diff] | |
| parent | 4fbe63d1c773cceef3fe1f6ed0c9c268f4f24760 [diff] |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next