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

[patchbot@xxxxxxx]

commit ecdae1cfaa7f6123decaa1b9d7205c3ff726b941
Merge: 6a7f7c988b8c159ffad50cfee7f81c6ab3d7b037 
712bdd018502f9bf88bb761ea648860bb0302d3b
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Fri Jun 5 14:35:49 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Jun 5 14:35:49 2015 +0100

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

 tools/libxc/include/xenctrl.h   |    9 ++----
 tools/libxc/xc_monitor.c        |   40 +++---------------------
 xen/arch/arm/mm.c               |    8 +++--
 xen/arch/x86/domain_page.c      |    3 +-
 xen/arch/x86/hvm/event.c        |   55 +++++++++------------------------
 xen/arch/x86/hvm/hvm.c          |   11 ++++--
 xen/arch/x86/hvm/vmx/vmx.c      |    6 ++-
 xen/arch/x86/mm.c               |    6 ++--
 xen/arch/x86/mm/hap/hap.c       |    7 ----
 xen/arch/x86/mm/shadow/common.c |    3 +-
 xen/arch/x86/mm/shadow/multi.c  |    6 ++--
 xen/arch/x86/monitor.c          |   63 ++++++++++++++------------------------
 xen/common/vmap.c               |   14 ++++----
 xen/drivers/acpi/osl.c          |    5 ++-
 xen/include/asm-arm/mm.h        |    2 -
 xen/include/asm-x86/domain.h    |   12 ++-----
 xen/include/asm-x86/guest_pt.h  |    9 -----
 xen/include/asm-x86/hvm/event.h |    6 ++--
 xen/include/asm-x86/mm.h        |   37 -----------------------
 xen/include/asm-x86/monitor.h   |    2 +
 xen/include/asm-x86/paging.h    |    1 -
 xen/include/public/domctl.h     |   12 ++++----
 xen/include/public/vm_event.h   |   29 ++++++++++--------
 xen/include/xen/mm.h            |   28 +++++++++++++++++
 xen/include/xen/typesafe.h      |   46 ++++++++++++++++++++++++++++
 xen/include/xen/vmap.h          |    6 ++--
 26 files changed, 188 insertions(+), 238 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