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

[patchbot@xxxxxxx]

commit 743289d0296268fe6bad64531a24d8053afeb062
Merge: b56892f5a9165397fcff0b0e45b9ee181cbb52c8 
672101b54269d7a69c2ccaa345ea396dcca63238
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Sun Aug 16 09:00:30 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Sun Aug 16 09:00:30 2015 +0100

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

 xen/arch/arm/guestcopy.c            |    4 +--
 xen/arch/arm/mm.c                   |    6 +++-
 xen/arch/x86/dmi_scan.c             |   21 +++++++++++----
 xen/arch/x86/hvm/hvm.c              |   48 ++++++++++++++++++++--------------
 xen/arch/x86/hvm/svm/nestedsvm.c    |   16 +++++++++--
 xen/arch/x86/hvm/vmx/vmx.c          |   13 ++++++---
 xen/arch/x86/hvm/vmx/vvmx.c         |   48 ++++++++++++++++++++++++-----------
 xen/arch/x86/mm.c                   |    6 +++-
 xen/arch/x86/mm/p2m.c               |   32 +++++++++++++++++++++++
 xen/common/grant_table.c            |    7 ++++-
 xen/common/memory.c                 |   32 ++++++++++++++---------
 xen/drivers/passthrough/vtd/iommu.c |    2 +-
 xen/include/asm-arm/mm.h            |    4 ---
 xen/include/asm-x86/hvm/hvm.h       |    3 +-
 xen/include/asm-x86/mm.h            |    3 --
 xen/include/asm-x86/p2m.h           |    4 +--
 xen/include/xen/mm.h                |    6 +++-
 17 files changed, 174 insertions(+), 81 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