diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-07-31 20:29:02 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-07-31 20:29:02 +0200 |
| commit | 4c5e9d9f0ddf5d4ba9c51eee2ef1a4d6e93ccf56 (patch) | |
| tree | ffa537cd1bd5282acc8e81458df84577eb8a45d1 /drivers/iommu/arm-smmu.c | |
| parent | af437469d14e91e8b4273606cac4c08f05bf056e (diff) | |
| parent | daff2f9c9a43f4180255dab7fdf13c7b44cc6abb (diff) | |
| parent | e8a6ebc71e40ec02cd0113c803e919c8329b411b (diff) | |
| parent | f683367ebd2d90a052d07e9b6787ddfb63a04239 (diff) | |
| parent | a188cf8d5e3aa5d6a0d68bff72a3f1eb01dfb8c6 (diff) | |
| parent | 4802c1d020f548c7c5b5a2e026081309625a28b3 (diff) | |
| parent | 1a5b5376442bd6c23b5722ecdc7242fcc61ce338 (diff) | |
Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu', 'arm/smmu', 'arm/exynos' and 'core' into next