Merge branch 'core' into x86/vt-d
Conflicts: drivers/iommu/intel-iommu.c
Showing
drivers/iommu/iommu-sysfs.c
0 → 100644
drivers/iommu/pci.h
已删除
100644 → 0
想要评论请 注册 或 登录
Conflicts: drivers/iommu/intel-iommu.c