| commit | f743166da7e93b617dd93120cdb5edcc8b84c464 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Mon Feb 10 11:48:21 2014 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Mon Feb 10 11:48:21 2014 +1100 |
| tree | cd71baff2cdd908bd4a5243f65f6b739a653d919 | |
| parent | 9c1db7798141e2658e4b5bb170128dfdc3270ff4 [diff] | |
| parent | 2172fa709ab32ca60e86179dc67d0857be8e2c98 [diff] |
Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into for-linus