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

[patchbot@xxxxxxx]

commit 375c911acc373b4765c0b6e53203e37ae4eb3745
Merge: 81dcaaa97a21cb397cd326fdcb8f9953ea23ceff 
9f0c658baedcd0f3f71c35b54965e440ffef0e45
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Dec 4 14:29:39 2013 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Dec 4 14:29:39 2013 +0000

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

 tools/libxl/libxl.c                  |   19 +-----
 tools/libxl/libxl_dom.c              |   35 ++++-------
 xen/arch/arm/arm32/vfp.c             |    2 +-
 xen/arch/arm/arm64/traps.c           |    2 +-
 xen/arch/arm/domain_build.c          |   18 +++---
 xen/arch/arm/early_printk.c          |    2 +-
 xen/arch/arm/gic.c                   |   16 +++---
 xen/arch/arm/kernel.c                |    8 +-
 xen/arch/arm/mm.c                    |    2 +-
 xen/arch/arm/platform.c              |    2 +-
 xen/arch/arm/setup.c                 |   10 ++--
 xen/arch/arm/smpboot.c               |    2 +-
 xen/arch/arm/time.c                  |    8 +-
 xen/arch/arm/traps.c                 |   10 ++--
 xen/arch/x86/apic.c                  |    4 +-
 xen/arch/x86/boot/cmdline.S          |    3 +-
 xen/arch/x86/bzimage.c               |    2 +-
 xen/arch/x86/cpu/amd.c               |   16 +++++-
 xen/arch/x86/cpu/mcheck/mce.c        |    4 +-
 xen/arch/x86/domain_build.c          |   20 +++---
 xen/arch/x86/hvm/svm/intr.c          |    2 +-
 xen/arch/x86/hvm/vmx/vvmx.c          |   19 ++++--
 xen/arch/x86/io_apic.c               |    4 +-
 xen/arch/x86/mm/mem_sharing.c        |   27 ++++++--
 xen/arch/x86/mm/mm-locks.h           |    2 +-
 xen/arch/x86/mpparse.c               |   10 ++--
 xen/arch/x86/setup.c                 |    6 +-
 xen/arch/x86/smpboot.c               |    2 +-
 xen/arch/x86/tboot.c                 |    2 +-
 xen/arch/x86/time.c                  |    2 +-
 xen/arch/x86/traps.c                 |   17 +++---
 xen/arch/x86/x86_64/mm.c             |    2 +-
 xen/arch/x86/x86_64/traps.c          |    2 +-
 xen/common/memory.c                  |    4 +-
 xen/common/page_alloc.c              |   47 +++++++--------
 xen/common/sched_arinc653.c          |  111 +++++++++++++++++++++++++--------
 xen/common/schedule.c                |    2 +-
 xen/common/vsprintf.c                |    3 +-
 xen/drivers/char/console.c           |    4 +-
 xen/drivers/passthrough/iommu.c      |    2 +-
 xen/drivers/passthrough/pci.c        |    2 +-
 xen/drivers/passthrough/vtd/dmar.h   |    2 +-
 xen/drivers/passthrough/vtd/iommu.c  |    4 +-
 xen/drivers/passthrough/vtd/qinval.c |    2 +-
 xen/include/asm-x86/msr-index.h      |    1 +
 xen/include/public/io/blkif.h        |   51 ++++++++++++++++
 xen/xsm/flask/hooks.c                |    2 +-
 47 files changed, 322 insertions(+), 197 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