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

[patchbot@xxxxxxx]

commit e5d02979c81962c69dc9ffeb58546d977f8f9443
Merge: 46561d20c0f764bd6b3a587fe6ed7c070d22f8a0 
fd553ae5f0f57baa63d033bedee84f607de57d33
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Sep 3 15:12:28 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Sep 3 15:12:28 2014 +0100

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

 xen/arch/x86/cpu/mcheck/mce.c   |    2 +-
 xen/arch/x86/hvm/hvm.c          |    2 +-
 xen/arch/x86/nmi.c              |    8 +++++++-
 xen/arch/x86/traps.c            |   13 +++++++------
 xen/arch/x86/x86_64/entry.S     |    3 +--
 xen/include/asm-x86/current.h   |    6 +++---
 xen/include/asm-x86/processor.h |    2 +-
 7 files changed, 21 insertions(+), 15 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