diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-30 17:49:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-30 17:49:28 +0200 |
| commit | 2f83766d4b18774c856329a8fca4c9338dfeda39 (patch) | |
| tree | a19ea2165755f5700d7f37a61ece7edce231744f /fs/ioprio.c | |
| parent | mm: fix vma_resv_map() NULL pointer (diff) | |
| parent | Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap', 'arm/tegra', 'core' an... (diff) | |
| download | linux-2f83766d4b18774c856329a8fca4c9338dfeda39.tar.xz linux-2f83766d4b18774c856329a8fca4c9338dfeda39.zip | |
Merge tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU updates from Joerg Roedel:
"Not much stuff this time. The only change to the IOMMU core code is
the addition of a handle to the fault handling code. A few updates to
the AMD IOMMU driver to work around new errata. The other patches are
mostly fixes and enhancements to the existing ARM IOMMU drivers and
documentation updates.
A new IOMMU driver for the Exynos platform was also underway but got
merged via the Samsung tree and is not part of this tree."
* tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
Documentation: kernel-parameters.txt Add amd_iommu_dump
iommu/core: pass a user-provided token to fault handlers
iommu/tegra: gart: Fix register offset correctly
iommu: OMAP: device detach on domain destroy
iommu: tegra/gart: Add device tree support
iommu: tegra/gart: use correct gart_device
iommu/tegra: smmu: Print device name correctly
iommu/amd: Add workaround for event log erratum
iommu/amd: Check for the right TLP prefix bit
dma-debug: release free_entries_lock before saving stack trace
Diffstat (limited to 'fs/ioprio.c')
0 files changed, 0 insertions, 0 deletions