diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-30 10:41:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-30 10:41:26 -0800 |
| commit | f3a3404162774770ded2ba1494a4c8ba27cd553e (patch) | |
| tree | af4771cc86d5a0324c5c9b55f05822c8c977c0cf /arch/arm/include/asm/kvm_mmu.h | |
| parent | c6591c8131984457626b29ec04b98132995885b9 (diff) | |
| parent | 35577079b9943e158c7032afe1dde6faf4385222 (diff) | |
Merge tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
"Two small fixes for the Tegra GART IOMMU driver:
- provide a .map_sg function for iommu_ops
- do not register Tegra GART driver as a workaround because of issues
with it when used from DRM code"
* tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/tegra: gart: Provide default ->map_sg() callback
iommu/tegra: gart: Do not register with bus
Diffstat (limited to 'arch/arm/include/asm/kvm_mmu.h')
0 files changed, 0 insertions, 0 deletions