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

[patchbot@xxxxxxx]

commit f74a9a5fe44d4060ae02d9bf7cefc597a3a6b785
Merge: cb8366d34ef5021af761ca1977d9cb305ba8fabd 
4f3283fea384229366b6df101c6c0e008b35105b
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Tue Feb 24 16:42:24 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Feb 24 16:42:24 2015 +0000

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

 MAINTAINERS                                  |    1 +
 tools/tests/x86_emulator/test_x86_emulator.c |    9 +
 xen/arch/x86/e820.c                          |   29 +--
 xen/arch/x86/hvm/hvm.c                       |    2 +-
 xen/arch/x86/mm.c                            |    4 +-
 xen/arch/x86/mm/shadow/common.c              |  249 +++++++++++---------
 xen/arch/x86/mm/shadow/multi.c               |  324 +++++++++++++-------------
 xen/arch/x86/mm/shadow/multi.h               |   28 ++--
 xen/arch/x86/mm/shadow/private.h             |   56 +++---
 xen/include/asm-x86/perfc_defn.h             |    2 +
 xen/include/asm-x86/shadow.h                 |    8 +-
 11 files changed, 371 insertions(+), 341 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