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

[patchbot@xxxxxxx]

commit 5157e9dfd52682a7376c0c6a9c13ea413c06047e
Merge: 364c9ee0076d66498c1ae2b2c65833cbe433ceba 
6e4ecc6d5884b816ed6eb1949561fdfb85acd179
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Tue Jun 17 10:40:39 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Jun 17 10:40:39 2014 +0100

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

 docs/misc/xen-command-line.markdown   |   10 ++
 docs/misc/xl-numa-placement.markdown  |  148 +++++++++++++++--------
 tools/libxc/xc_domain.c               |   50 +++++---
 xen/arch/x86/acpi/cpuidle_menu.c      |   21 +++-
 xen/arch/x86/cpu/mcheck/mce_intel.c   |   19 ++-
 xen/arch/x86/efi/boot.c               |   15 ++-
 xen/arch/x86/physdev.c                |    7 +-
 xen/arch/x86/traps.c                  |   13 +-
 xen/common/domain.c                   |   86 ++++++++-----
 xen/common/domctl.c                   |  107 +++++++++++++++--
 xen/common/keyhandler.c               |    4 +-
 xen/common/page_alloc.c               |  214 ++++++++++++++++++++++++++++++---
 xen/common/sched_credit.c             |  161 ++++++++++---------------
 xen/common/sched_sedf.c               |    2 +-
 xen/common/schedule.c                 |   66 ++++++----
 xen/common/wait.c                     |   10 +-
 xen/drivers/passthrough/io.c          |  185 ++++++++++++++++-------------
 xen/drivers/passthrough/vtd/x86/vtd.c |    8 +-
 xen/include/asm-arm/numa.h            |    1 +
 xen/include/asm-x86/hvm/io.h          |    2 +-
 xen/include/public/domctl.h           |   29 ++++-
 xen/include/xen/hvm/irq.h             |    4 +-
 xen/include/xen/sched-if.h            |    2 -
 xen/include/xen/sched.h               |   15 ++-
 24 files changed, 795 insertions(+), 384 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