tree 216cf72ea9fc6e7e1f995029cf5ead4a4aeb3301
parent 54fb723cc48db2fde964fb9bb0eaaccf2cf31a9f
parent c0828e50485932b7e019df377a6b0a8d1ebd3080
author James Morris <james.l.morris@oracle.com> 1386901675 +1100
committer James Morris <james.l.morris@oracle.com> 1386901675 +1100

Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux_fixes into for-linus