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

[patchbot@xxxxxxx]

commit 636306f825ca2356762c4494526667b7da7a3dfd
Merge: 49ab17a3a615e1ab4ccc46d6942f925cf841df4b 
72c7e0ffd15f48f346e1b740d074679d5207e5d1
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Mar 11 13:12:25 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Mar 11 13:12:25 2015 +0000

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

 xen/arch/x86/x86_emulate/x86_emulate.c  |   14 ++++----------
 xen/common/sched_credit2.c              |   12 ++++++------
 xen/drivers/passthrough/amd/iommu_map.c |    3 ---
 xen/drivers/passthrough/iommu.c         |    3 +--
 xen/drivers/passthrough/vtd/iommu.c     |    3 ---
 5 files changed, 11 insertions(+), 24 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