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

[patchbot@xxxxxxx]

commit 79d2f02ba1359cc765c0ea38227fd967f7b81696
Merge: a9d0e9aff23a78f143dcdc142d267b05fc15e859 
1a51423b5031ff88063c014dc33ca4bff39b5367
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Mon Feb 22 16:40:12 2016 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Feb 22 16:40:12 2016 +0000

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

 tools/libxc/xc_dom_x86.c       |  2 +-
 xen/arch/x86/hvm/event.c       | 35 ++------------------------
 xen/arch/x86/mm.c              |  8 +++---
 xen/arch/x86/mm/p2m.c          | 57 +-----------------------------------------
 xen/arch/x86/vm_event.c        | 57 ++++++++++++++++++++++++++++++++++++++++++
 xen/arch/x86/x86_64/entry.S    |  1 -
 xen/arch/x86/xen.lds.S         |  2 +-
 xen/common/sched_credit.c      |  2 +-
 xen/common/sched_credit2.c     |  6 ++---
 xen/common/sched_rt.c          |  2 +-
 xen/include/asm-arm/config.h   |  6 -----
 xen/include/asm-x86/config.h   |  1 -
 xen/include/asm-x86/vm_event.h |  2 ++
 xen/include/public/xen.h       |  4 +--
 xen/include/xen/config.h       |  2 ++
 xen/include/xen/tmem_xen.h     |  3 +--
 16 files changed, 78 insertions(+), 112 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