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

[patchbot@xxxxxxx]

commit 47ec25a3c8cdd7a057af0a05e8e00257ef950437
Merge: 088e9b2796bd1f9ebe4fda800275cc689677b699 
818e376d3b17845d39735517650224c64c9e0078
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Fri May 29 13:22:31 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri May 29 13:22:31 2015 +0100

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

 Config.mk                            |    6 +-
 xen/arch/arm/README.LinuxPrimitives  |   28 ++++++++
 xen/arch/x86/hvm/vmx/vmcs.c          |    4 +
 xen/common/spinlock.c                |  116 ++++++++++++++-------------------
 xen/include/asm-arm/arm32/spinlock.h |   66 +++++++++++++++++++
 xen/include/asm-arm/arm64/spinlock.h |   63 ++++++++++++++++++
 xen/include/asm-arm/spinlock.h       |   23 +++++++
 xen/include/asm-arm/system.h         |    3 -
 xen/include/asm-x86/spinlock.h       |   37 +++++++++++
 xen/include/asm-x86/system.h         |   11 ---
 xen/include/public/domctl.h          |    2 +-
 xen/include/xen/spinlock.h           |   19 ++----
 12 files changed, 280 insertions(+), 98 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