Merge branch 'linus' into x86/asm, to pick up fixes

author Ingo Molnar <mingo@kernel.org>

Tue, 1 Nov 2016 06:41:06 +0000 (07:41 +0100)

committer Ingo Molnar <mingo@kernel.org>

Tue, 1 Nov 2016 06:41:06 +0000 (07:41 +0100)
author Ingo Molnar <mingo@kernel.org>
Tue, 1 Nov 2016 06:41:06 +0000 (07:41 +0100)
committer Ingo Molnar <mingo@kernel.org>
Tue, 1 Nov 2016 06:41:06 +0000 (07:41 +0100)
diff --cc arch/x86/kernel/smpboot.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 1 Nov 2016 06:41:06 +0000 (07:41 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 1 Nov 2016 06:41:06 +0000 (07:41 +0100)
		1	2
arch/x86/kernel/smpboot.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history