tree 455a263e0155b7096cc5766a86c71fbc9879e08a
parent 1604f8719a2dba692c12d333104fcc92613003af
parent 892e8cac99a71f6254f84fc662068d912e1943bf
author James Morris <james.l.morris@oracle.com> 1436570025 +1000
committer James Morris <james.l.morris@oracle.com> 1436570025 +1000

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2