Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into...
authorJames Morris <james.l.morris@oracle.com>
Wed, 16 Jul 2014 17:05:51 +0000 (03:05 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 16 Jul 2014 17:05:51 +0000 (03:05 +1000)
1  2 
include/linux/security.h
security/selinux/hooks.c

Simple merge
Simple merge