Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into...

author James Morris <james.l.morris@oracle.com>

Tue, 29 Jul 2014 15:31:46 +0000 (01:31 +1000)

committer James Morris <james.l.morris@oracle.com>

Tue, 29 Jul 2014 15:31:46 +0000 (01:31 +1000)
author James Morris <james.l.morris@oracle.com>
Tue, 29 Jul 2014 15:31:46 +0000 (01:31 +1000)
committer James Morris <james.l.morris@oracle.com>
Tue, 29 Jul 2014 15:31:46 +0000 (01:31 +1000)
diff --cc include/linux/security.h
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
author	James Morris <james.l.morris@oracle.com>
	Tue, 29 Jul 2014 15:31:46 +0000 (01:31 +1000)
committer	James Morris <james.l.morris@oracle.com>
	Tue, 29 Jul 2014 15:31:46 +0000 (01:31 +1000)
		1	2
include/linux/security.h	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history