diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-11-02 14:03:34 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-11-02 14:03:34 +0300 |
| commit | b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a (patch) | |
| tree | e203b2b499c76c2e35563cefd8b03146bf1cf73c /drivers/iommu/Makefile | |
| parent | 6a13feb9c82803e2b815eca72fa7a9f5561d7861 (diff) | |
| parent | b61e5e80e3cd37f0183cdc04b03861a0467d9f52 (diff) | |
| parent | 3ca9299e7dc65f2d8242cd7804818a8e840b5a26 (diff) | |
| parent | 166bdbd23161160f2abcea70621adba179050bee (diff) | |
| parent | 8128f23c436d0dd4f72412e1bf9256e424479dc3 (diff) | |
| parent | 1228236de5f978970fb814cc27138cdb00cbb48d (diff) | |
| parent | 393c092a4d3ace7b8cef633ede2171104dd504d7 (diff) | |
| download | linux-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