Merge branch 'x86/microcode'

author Ingo Molnar <mingo@kernel.org>

Tue, 14 Jan 2014 16:19:43 +0000 (17:19 +0100)

committer Ingo Molnar <mingo@kernel.org>

Tue, 14 Jan 2014 16:19:43 +0000 (17:19 +0100)
author Ingo Molnar <mingo@kernel.org>
Tue, 14 Jan 2014 16:19:43 +0000 (17:19 +0100)
committer Ingo Molnar <mingo@kernel.org>
Tue, 14 Jan 2014 16:19:43 +0000 (17:19 +0100)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/Makefile
Simple merge
diff --cc arch/x86/kernel/cpu/Makefile
Simple merge
diff --cc arch/x86/kernel/setup.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 14 Jan 2014 16:19:43 +0000 (17:19 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 14 Jan 2014 16:19:43 +0000 (17:19 +0100)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history