Merge branch 'linus' into x86/asm, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Tue, 1 Nov 2016 06:41:06 +0000 (07:41 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 1 Nov 2016 06:41:06 +0000 (07:41 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/smpboot.c
mm/page_alloc.c

Simple merge
diff --cc mm/page_alloc.c
Simple merge