Merge remote-tracking branch 'security/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 16 Jan 2014 02:56:12 +0000 (13:56 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history