Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base
authorIngo Molnar <mingo@kernel.org>
Wed, 13 Apr 2016 09:36:19 +0000 (11:36 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 13 Apr 2016 09:36:19 +0000 (11:36 +0200)
commitd8d1c35139481ee8e292d91cd3fd35a6b3a316eb
tree0a06b6c185e91bf14b22e7f526755e2ca80209bf
parentcb44d0cfc2969999a4d9e20e4fd8749fec6c5498
parent1886297ce0c8d563a08c8a8c4c0b97743e06cd37
Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base

 Conflicts:
arch/x86/include/asm/cpufeature.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/mtrr/generic.c
arch/x86/xen/enlighten.c