[Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging

[patchbot@xxxxxxx]

commit 38d4393462ad766fd10313f323a329be29a2f58e
Merge: 92f962f4a72f297a0e21bf1acbea4a685a487fc7 
b6100a6cd5b9ff6de07726e3acf744454926c962
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Tue Jun 10 15:11:04 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Jun 10 15:11:04 2014 +0100

    Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into 
staging

 xen/arch/x86/alternative.c              |    2 +-
 xen/arch/x86/cpu/mcheck/mcaction.c      |    2 +-
 xen/arch/x86/cpu/mcheck/mcaction.h      |    2 +-
 xen/arch/x86/cpu/mcheck/mce.c           |   12 ++++++------
 xen/arch/x86/cpu/mcheck/mce.h           |    4 ++--
 xen/arch/x86/cpu/mcheck/mce_amd.c       |    2 +-
 xen/arch/x86/cpu/mcheck/mce_intel.c     |   12 ++++++------
 xen/arch/x86/cpu/mcheck/x86_mca.h       |    2 +-
 xen/arch/x86/efi/boot.c                 |   13 ++++++++-----
 xen/arch/x86/hvm/hvm.c                  |    4 ++--
 xen/arch/x86/nmi.c                      |    2 +-
 xen/arch/x86/oprofile/nmi_int.c         |    2 +-
 xen/arch/x86/oprofile/op_model_athlon.c |    6 +++---
 xen/arch/x86/oprofile/op_model_p4.c     |    2 +-
 xen/arch/x86/oprofile/op_model_ppro.c   |    2 +-
 xen/arch/x86/oprofile/op_x86_model.h    |    2 +-
 xen/arch/x86/traps.c                    |   20 ++++++++++----------
 xen/arch/x86/x86_64/compat/traps.c      |    2 +-
 xen/arch/x86/x86_64/traps.c             |    2 +-
 xen/include/asm-x86/apic.h              |    2 +-
 xen/include/asm-x86/hvm/hvm.h           |   22 +++++++++++++++-------
 xen/include/asm-x86/nmi.h               |    2 +-
 xen/include/asm-x86/processor.h         |   27 +++++++++++++++++----------
 xen/include/asm-x86/traps.h             |    2 +-
 24 files changed, 84 insertions(+), 66 deletions(-)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog