diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-08 19:11:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-08 19:11:00 -0800 |
| commit | 63082402968f4b73f10b28a8ac1f3da821aeb82d (patch) | |
| tree | 1d6dcb15d7b2102211453b79e7922919396d14fa /drivers/video/sis/init301.h | |
| parent | 19e75ed46faffbe795c306eed2a79010c7244a68 (diff) | |
| parent | 05df1f3c2afaef5672627f2b7095f0d4c4dbc3a0 (diff) | |
| download | linux-63082402968f4b73f10b28a8ac1f3da821aeb82d.tar.gz linux-63082402968f4b73f10b28a8ac1f3da821aeb82d.tar.bz2 linux-63082402968f4b73f10b28a8ac1f3da821aeb82d.zip | |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
One patch fixes an bug in the ARM/MSM IOMMU code which returned sucess
in the unmap function even when an error occured and the other patch
adds a workaround into the AMD IOMMU driver to better handle broken IVRS
ACPI tables (this patch fixes the case when a device is not listed in
the table but actually translated by the iommu).
* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/msm: Fix error handling in msm_iommu_unmap()
iommu/amd: Work around broken IVRS tables
Diffstat (limited to 'drivers/video/sis/init301.h')
0 files changed, 0 insertions, 0 deletions