diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-10 17:36:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-10 17:36:19 -0700 |
| commit | 9c3e1323ecb382ef8731c7e7dc0891e4e00f9607 (patch) | |
| tree | db49c6d82881377d5eb5dfb7cb9ae0dce6ea0174 /drivers/ata/Makefile | |
| parent | affb8172de395a6e1db52ed9790ca0456d8c29a9 (diff) | |
| parent | d05321ecfd77b6204b28e5d98fb75befabf62b53 (diff) | |
Merge tag 'iommu-fixes-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
"The patches contain:
- fix multiple ARM IOMMU drivers to behave well when the hardware is
not present
- mark MSM driver as broken
- fix build errors with the new ARM generic io-page-table code"
* tag 'iommu-fixes-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/io-pgtable-arm: Add built time dependency
iommu/msm: Mark driver BROKEN
iommu/rockchip: Play nice in multi-platform builds
iommu/omap: Play nice in multi-platform builds
iommu/exynos: Play nice in multi-platform builds
iommu/io-pgtable-arm: Fix self-test WARNs on i386
Diffstat (limited to 'drivers/ata/Makefile')
0 files changed, 0 insertions, 0 deletions