| commit | d93aca6050b10cd7d8b491637c3b5344c5680cac | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Fri Dec 13 13:27:55 2013 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Fri Dec 13 13:27:55 2013 +1100 |
| tree | 216cf72ea9fc6e7e1f995029cf5ead4a4aeb3301 | |
| parent | 54fb723cc48db2fde964fb9bb0eaaccf2cf31a9f [diff] | |
| parent | c0828e50485932b7e019df377a6b0a8d1ebd3080 [diff] |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux_fixes into for-linus