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 /drivers/iommu | |
| parent | fe82dcec644244676d55a1384c958d5f67979adb (diff) | |
| parent | f171abab8f1a75797124be5aae8376e20e4852d9 (diff) | |
| parent | a6fda0f586bb2c39e763a2ae5561e1f6ade8c3a8 (diff) | |
| parent | dedd9431484a826f85667967ef0c5954b12c3537 (diff) | |
| parent | 80f7b3d1b1f4ec6c80fa3b40c7c9a419e28b0897 (diff) | |
| parent | c50e3247aa2d825e0dc0f4b876ee22d7134d24ca (diff) | |
| parent | 5fc24d8cb9d43e0db335137051092da03a6845dc (diff) | |
Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next
Conflicts:
drivers/iommu/arm-smmu.c