| commit | 9b32011acdc4428474b7cba865f713a11b9b9bd3 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Oct 16 21:04:18 2014 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Oct 16 21:04:18 2014 +1100 |
| tree | d781cae7fd53a4f19d0d64503ae605dd01855613 | |
| parent | 0429fbc0bdc297d64188483ba029a23773ae07b0 [diff] | |
| parent | 923190d32de4428afbea5e5773be86bea60a9925 [diff] |
Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus2