diff options
author | Joerg Roedel <jroedel@suse.de> | 2015-06-19 17:17:47 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2015-06-19 17:17:47 +0200 |
commit | 5ffde2f67181195d457b95df44b8f88e8d969d89 (patch) | |
tree | 5465b7b28185140dcf2e63030bd1e63d1d27409d /drivers/iommu/iommu.c | |
parent | ec4292defd42fe45dc9807cedd22b00ffa9f09ae (diff) | |
parent | aa759fd376fbbfc34d5bf21b8f280ce68c17d064 (diff) | |
parent | 8a0a01bff855a6763d937acc70a876cb0bed063d (diff) | |
parent | 571dbbd4d044e11c78bc077acb3ccef4c77b096e (diff) | |
parent | 0b3fff54bc01e8e6064d222a33e6fa7adabd94cd (diff) | |
parent | 4d58b8a6de6b8c3611f10124f83e90e5a2406437 (diff) | |
parent | 733cac2ade2fbb73740a1d22c05c7b006a6cf3d2 (diff) |
Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', 'default-domains' and 'core' into next