| commit | 09c626892772e6fe03f768b3492fbb126f465fe6 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Nov 13 21:49:53 2014 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Nov 13 21:49:53 2014 +1100 |
| tree | e9790399d23ddd6799d129d01eb4096affe5a58b | |
| parent | 04689e749b7ec156291446028a0ce2e685bf3855 [diff] | |
| parent | d950f84c1c6658faec2ecbf5b09f7e7191953394 [diff] |
Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus