Merge remote-tracking branch 'security/next'

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

Wed, 19 Jun 2013 04:10:07 +0000 (14:10 +1000)

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

Wed, 19 Jun 2013 04:10:07 +0000 (14:10 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 04:10:07 +0000 (14:10 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 04:10:07 +0000 (14:10 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/security.h
Simple merge
diff --cc security/smack/smack_lsm.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 04:10:07 +0000 (14:10 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 04:10:07 +0000 (14:10 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	patch \|	diff1 \|	diff2 \|	blob \| history
security/smack/smack_lsm.c	patch \|	diff1 \|	diff2 \|	blob \| history