Merge remote-tracking branch 'lblnet/master'

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

Fri, 28 Jun 2013 04:17:58 +0000 (14:17 +1000)

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

Fri, 28 Jun 2013 04:17:58 +0000 (14:17 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:17:58 +0000 (14:17 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:17:58 +0000 (14:17 +1000)
diff --cc include/linux/security.h
Simple merge
diff --cc security/capability.c
Simple merge
diff --cc security/security.c
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 04:17:58 +0000 (14:17 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 04:17:58 +0000 (14:17 +1000)
		1	2
include/linux/security.h	patch \|	diff1 \|	diff2 \|	blob \| history
security/capability.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/security.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history