| commit | 3dbbbe0eb6e949409d215f660cfad782aa541a4b | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Sat Jul 11 09:13:45 2015 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Sat Jul 11 09:13:45 2015 +1000 |
| tree | 455a263e0155b7096cc5766a86c71fbc9879e08a | |
| parent | 1604f8719a2dba692c12d333104fcc92613003af [diff] | |
| parent | 892e8cac99a71f6254f84fc662068d912e1943bf [diff] |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2