Merge branch 'ras/core'

author Ingo Molnar <mingo@kernel.org>

Sun, 1 Nov 2015 10:24:05 +0000 (11:24 +0100)

committer Ingo Molnar <mingo@kernel.org>

Sun, 1 Nov 2015 10:24:05 +0000 (11:24 +0100)
author Ingo Molnar <mingo@kernel.org>
Sun, 1 Nov 2015 10:24:05 +0000 (11:24 +0100)
committer Ingo Molnar <mingo@kernel.org>
Sun, 1 Nov 2015 10:24:05 +0000 (11:24 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/kernel/setup.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Sun, 1 Nov 2015 10:24:05 +0000 (11:24 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Sun, 1 Nov 2015 10:24:05 +0000 (11:24 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history