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

author James Morris <[email protected]>

Mon, 19 Sep 2016 02:27:10 +0000 (12:27 +1000)

committer James Morris <[email protected]>

Mon, 19 Sep 2016 02:27:10 +0000 (12:27 +1000)
author James Morris <[email protected]>
Mon, 19 Sep 2016 02:27:10 +0000 (12:27 +1000)
committer James Morris <[email protected]>
Mon, 19 Sep 2016 02:27:10 +0000 (12:27 +1000)
diff --cc include/linux/lsm_hooks.h
Simple merge
diff --cc include/linux/security.h
Simple merge
author	James Morris <[email protected]>
	Mon, 19 Sep 2016 02:27:10 +0000 (12:27 +1000)
committer	James Morris <[email protected]>
	Mon, 19 Sep 2016 02:27:10 +0000 (12:27 +1000)
		1	2
include/linux/lsm_hooks.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	patch \|	diff1 \|	diff2 \|	blob \| history