| commit | 76771c938e95ce4106c6e8092f4f614d4d1e0ecc | [log] [tgz] |
|---|---|---|
| author | Joerg Roedel <jroedel@suse.de> | Tue Dec 02 13:07:13 2014 +0100 |
| committer | Joerg Roedel <jroedel@suse.de> | Tue Dec 02 13:07:13 2014 +0100 |
| tree | c2fb0f7e70013f745f62fb74899f04c40f052640 | |
| parent | 99cb9aee770e482ac5ab1fe77213a38df9dd4e77 [diff] | |
| parent | 263bc3fd6a8e50dc3ef423f36a1ec9cd951a76b8 [diff] | |
| parent | 11175886daa6b31dfc713b6664215405de9ea1c7 [diff] | |
| parent | e222d6a4259c134553acab493b5ab9fc05d70132 [diff] | |
| parent | 2d565a57f2520b6bc2de0eef1d77d9683f397947 [diff] | |
| parent | cc4f14aa170d895c9a43bdb56f62070c8a6da908 [diff] | |
| parent | 1c51099a427dc8bfee917b2d0e53ad3fafbb930d [diff] | |
| parent | 18f23409909a9547ac7c149013286f36fcffa433 [diff] |
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