diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-02-04 16:53:44 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-02-04 16:53:44 +0100 |
| commit | a20cc76b9efae10c20123049df361adcd7f0e0b3 (patch) | |
| tree | 195502a0d3dfa60ccf0704070e13440be837c068 /include/trace | |
| parent | iommu/ipmmu-vmsa: Fix IOMMU lookup when multiple IOMMUs are registered (diff) | |
| parent | iommu/arm-smmu: Avoid build warning (diff) | |
| parent | iommu/omap: Print phys_addr_t using %pa (diff) | |
| parent | iommu/fsl: Various cleanups (diff) | |
| parent | iommu/amd: Convert non-returned local variable to boolean when relevant (diff) | |
| parent | iommu: Update my email address (diff) | |
| download | linux-a20cc76b9efae10c20123049df361adcd7f0e0b3.tar.xz linux-a20cc76b9efae10c20123049df361adcd7f0e0b3.zip | |
Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next
Conflicts:
drivers/iommu/Kconfig
drivers/iommu/Makefile