diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-10-02 12:24:45 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-10-02 12:24:45 +0200 |
| commit | 09b5269a1b3d47525d7c25efeb16f5407ef82ea2 (patch) | |
| tree | 8a505c93aed6058c3495f01bf295cf5a0e9c606d /block/scsi_ioctl.c | |
| parent | Linux 3.17-rc7 (diff) | |
| parent | iommu/exynos: Fix trivial typos (diff) | |
| parent | iommu/omap: Remove omap_iommu unused owner field (diff) | |
| parent | Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin... (diff) | |
| parent | iommu/vt-d: Work around broken RMRR firmware entries (diff) | |
| parent | iommu/amd: Fix devid mapping for ivrs_ioapic override (diff) | |
| parent | iommu/irq_remapping: Fix the regression of hpet irq remapping (diff) | |
| download | linux-09b5269a1b3d47525d7c25efeb16f5407ef82ea2.tar.xz linux-09b5269a1b3d47525d7c25efeb16f5407ef82ea2.zip | |
Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next
Conflicts:
drivers/iommu/arm-smmu.c