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

[patchbot@xxxxxxx]

commit 8faa4049cfc74fc8fa2887d3b5ed0d225a21a97b
Merge: db94bdb3145c48356d17637a33c4298613215c21 
7113a45451a9f656deeff070e47672043ed83664
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Dec 11 13:36:27 2013 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Dec 11 13:36:27 2013 +0000

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

 MAINTAINERS                               |    8 ++
 docs/misc/xsm-flask.txt                   |  183 +++++++++++++++++++++++++++++
 xen/arch/x86/acpi/cpu_idle.c              |    9 +-
 xen/arch/x86/domain.c                     |    5 +-
 xen/arch/x86/mm.c                         |    2 +-
 xen/arch/x86/setup.c                      |    4 +-
 xen/drivers/passthrough/amd/iommu_guest.c |   11 +-
 xen/drivers/passthrough/iommu.c           |   24 ++--
 8 files changed, 220 insertions(+), 26 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