Merge tag 'v3.14' into next

author Paul Moore <[email protected]>

Mon, 31 Mar 2014 13:49:07 +0000 (09:49 -0400)

committer Paul Moore <[email protected]>

Mon, 31 Mar 2014 13:49:07 +0000 (09:49 -0400)
author Paul Moore <[email protected]>
Mon, 31 Mar 2014 13:49:07 +0000 (09:49 -0400)
committer Paul Moore <[email protected]>
Mon, 31 Mar 2014 13:49:07 +0000 (09:49 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
author	Paul Moore <[email protected]>
	Mon, 31 Mar 2014 13:49:07 +0000 (09:49 -0400)
committer	Paul Moore <[email protected]>
	Mon, 31 Mar 2014 13:49:07 +0000 (09:49 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history