drivers/iommu/iommu.c · 97027da6adf2e24a4e8d3d9c0668da3006b29971 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next · 395e51f1
Joerg Roedel authored Jul 23, 2012
```
Conflicts:
	drivers/iommu/iommu.c
	include/linux/iommu.h
```
395e51f1

iommu.c 23 KB