Merge branch 'x86/asm' into x86/mm, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Fri, 15 Jul 2016 08:26:04 +0000 (10:26 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 15 Jul 2016 08:26:04 +0000 (10:26 +0200)
commit38452af2424dc99854c78523d74b260fa8a984f0
tree0dc49c27e1a58a0b35c23db05d85d2e8571ea471
parentdcb32d9913b7ed527b135a7e221f8d14b67bb952
parentbe8a18e2e98e04a5def5887d913b267865562448
Merge branch 'x86/asm' into x86/mm, to resolve conflicts

 Conflicts:
tools/testing/selftests/x86/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/boot/boot.h
tools/testing/selftests/x86/Makefile