Merge branch 'x86/boot' into x86/urgent
authorIngo Molnar <mingo@kernel.org>
Tue, 30 Jun 2015 05:57:04 +0000 (07:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 30 Jun 2015 05:57:04 +0000 (07:57 +0200)
Merge branch that got ready.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
Documentation/x86/boot.txt
arch/x86/kernel/setup.c

Simple merge
Simple merge