Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next

author Al Viro <viro@zeniv.linux.org.uk>

Thu, 7 Aug 2014 18:07:57 +0000 (14:07 -0400)

committer Al Viro <viro@zeniv.linux.org.uk>

Thu, 7 Aug 2014 18:07:57 +0000 (14:07 -0400)
author Al Viro <viro@zeniv.linux.org.uk>
Thu, 7 Aug 2014 18:07:57 +0000 (14:07 -0400)
committer Al Viro <viro@zeniv.linux.org.uk>
Thu, 7 Aug 2014 18:07:57 +0000 (14:07 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc include/linux/sched.h
Simple merge
author	Al Viro <viro@zeniv.linux.org.uk>
	Thu, 7 Aug 2014 18:07:57 +0000 (14:07 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Thu, 7 Aug 2014 18:07:57 +0000 (14:07 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history