diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-20 19:33:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-20 19:33:49 +0200 |
| commit | 5269519f9f05888bf52c4b71ed84d37c03c8aadb (patch) | |
| tree | c8f00a768b05ef31d1cc65b8e9c9f124c1648a5a /drivers/dma/edma.c | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Merge git://git.infradead.org/iommu-2.6 into iommu/fixes (diff) | |
| download | linux-5269519f9f05888bf52c4b71ed84d37c03c8aadb.tar.xz linux-5269519f9f05888bf52c4b71ed84d37c03c8aadb.zip | |
Merge tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
"Fixes for regressions:
- fix wrong IOMMU enumeration causing some SCSI device drivers
initialization failures
- ARM-SMMU fixes for a panic condition and a wrong return value"
* tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte
iommu/arm-smmu: Return 0 on unmap failure
iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors
iommu/vt-d: Fix get_domain_for_dev() handling of upstream PCIe bridges
iommu/vt-d: fix memory leakage caused by commit ea8ea46
Diffstat (limited to 'drivers/dma/edma.c')
0 files changed, 0 insertions, 0 deletions