Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...
authorJames Morris <james.l.morris@oracle.com>
Fri, 10 Jul 2015 23:13:45 +0000 (09:13 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 10 Jul 2015 23:13:45 +0000 (09:13 +1000)
commit3dbbbe0eb6e949409d215f660cfad782aa541a4b
tree455a263e0155b7096cc5766a86c71fbc9879e08a
parent1604f8719a2dba692c12d333104fcc92613003af
parent892e8cac99a71f6254f84fc662068d912e1943bf
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2
security/selinux/hooks.c