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

[patchbot@xxxxxxx]

commit 7cb37dfaaaafd42df7413c81100a6eb117e047a1
Merge: e78e8b9bb649bf0f18d940fb12a4f6c55be34915 
7349efc695852c70b8c5e24d9ecf208757e8b471
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed May 13 15:46:54 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed May 13 15:46:54 2015 +0100

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

 xen/drivers/passthrough/amd/iommu_map.c      |   13 ++++++++++---
 xen/drivers/passthrough/vtd/iommu.h          |    1 -
 xen/drivers/passthrough/x86/iommu.c          |   15 +++++++++++----
 xen/include/asm-x86/hvm/iommu.h              |    2 ++
 xen/include/asm-x86/hvm/svm/amd-iommu-defs.h |    2 --
 5 files changed, 23 insertions(+), 10 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