diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-12-02 13:07:13 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-12-02 13:07:13 +0100 |
| commit | 76771c938e95ce4106c6e8092f4f614d4d1e0ecc (patch) | |
| tree | c2fb0f7e70013f745f62fb74899f04c40f052640 /drivers/iommu/omap-iommu.c | |
| parent | iommu/omap: Use dev_get_platdata() (diff) | |
| parent | iommu/msm: Use dev_get_platdata() (diff) | |
| parent | iommu/rockchip: Allow to compile with COMPILE_TEST (diff) | |
| parent | iommu/ipmmu-vmsa: Return proper error if devm_request_irq fails (diff) | |
| parent | Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin... (diff) | |
| parent | iommu/vt-d: Fix an off-by-one bug in __domain_mapping() (diff) | |
| parent | iommu/amd: Fix accounting of device_state (diff) | |
| parent | iommu: Decouple iommu_map_sg from CPU page size (diff) | |
| download | linux-76771c938e95ce4106c6e8092f4f614d4d1e0ecc.tar.xz linux-76771c938e95ce4106c6e8092f4f614d4d1e0ecc.zip | |
Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next
Conflicts:
drivers/iommu/arm-smmu.c