Failed in applying to current master (
apply log)
xen/arch/x86/cpu/mcheck/mcaction.h | 2 +-
xen/arch/x86/cpu/mcheck/mctelem.c | 2 +-
xen/arch/x86/cpu/mcheck/mctelem.h | 25 +++++++++++++------------
xen/arch/x86/cpu/mcheck/vmce.h | 8 ++++----
xen/arch/x86/hpet.c | 2 +-
xen/arch/x86/include/asm/cpuidle.h | 11 ++++++-----
xen/arch/x86/include/asm/domain.h | 26 +++++++++++++-------------
xen/arch/x86/include/asm/hpet.h | 2 +-
xen/arch/x86/include/asm/mtrr.h | 10 +++++-----
9 files changed, 45 insertions(+), 43 deletions(-)