summaryrefslogtreecommitdiff
path: root/drivers/iommu/Makefile
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-11-02 14:03:34 +0300
committerJoerg Roedel <jroedel@suse.de>2015-11-02 14:03:34 +0300
commitb67ad2f7c7514f94fe6bbd0cd86add445eb4e64a (patch)
treee203b2b499c76c2e35563cefd8b03146bf1cf73c /drivers/iommu/Makefile
parent6a13feb9c82803e2b815eca72fa7a9f5561d7861 (diff)
parentb61e5e80e3cd37f0183cdc04b03861a0467d9f52 (diff)
parent3ca9299e7dc65f2d8242cd7804818a8e840b5a26 (diff)
parent166bdbd23161160f2abcea70621adba179050bee (diff)
parent8128f23c436d0dd4f72412e1bf9256e424479dc3 (diff)
parent1228236de5f978970fb814cc27138cdb00cbb48d (diff)
parent393c092a4d3ace7b8cef633ede2171104dd504d7 (diff)
downloadlinux-b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a.tar.xz
Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next
Conflicts: drivers/iommu/amd_iommu_types.h