Sync to mainline for security submaintainers to work against

author James Morris <[email protected]>

Mon, 22 May 2017 06:32:40 +0000 (16:32 +1000)

committer James Morris <[email protected]>

Mon, 22 May 2017 06:32:40 +0000 (16:32 +1000)
author James Morris <[email protected]>
Mon, 22 May 2017 06:32:40 +0000 (16:32 +1000)
committer James Morris <[email protected]>
Mon, 22 May 2017 06:32:40 +0000 (16:32 +1000)
diff --cc security/Kconfig
Simple merge
diff --cc security/security.c
Simple merge
author	James Morris <[email protected]>
	Mon, 22 May 2017 06:32:40 +0000 (16:32 +1000)
committer	James Morris <[email protected]>
	Mon, 22 May 2017 06:32:40 +0000 (16:32 +1000)
		1	2
security/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
security/security.c	patch \|	diff1 \|	diff2 \|	blob \| history