diff options
author | Joerg Roedel <jroedel@suse.de> | 2017-05-04 19:06:17 +0300 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2017-05-04 19:06:17 +0300 |
commit | 2c0248d68880fc0e783af1048b3367ee5d4412f0 (patch) | |
tree | ab377d1dac914a047329ceff87e7dbe53d212217 /include/linux/dma-iommu.h | |
parent | d5bf739dc7628a35b334cdb9058750388927760a (diff) | |
parent | fd8e2d4b393252505783656471465c7f85f3c0a9 (diff) | |
parent | c9d9f2394c6a953585874a1a6cb2ecea853fdcf2 (diff) | |
parent | 6f66ea099fc2f31d31d6cd39f3b13b23bdeb6196 (diff) | |
parent | bdf95923086fb359ccb44c815724c3ace1611c90 (diff) | |
parent | 26b37b946a5c2658dbc37dd5d6df40aaa9685d70 (diff) | |
parent | 8e12188400668046870087fc278404a11c853061 (diff) | |
parent | 73dbd4a4230216b6a5540a362edceae0c9b4876b (diff) | |
parent | 290d638e04e7b94ff34d2f5e9426e7ce617e9a59 (diff) | |
download | linux-2c0248d68880fc0e783af1048b3367ee5d4412f0.tar.xz |
Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next