diff options
author | Joerg Roedel <jroedel@suse.de> | 2018-08-08 12:02:27 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2018-08-08 12:02:27 +0200 |
commit | 6488a7f35eeab463f6c9c2ea34d30ca856f0bc8e (patch) | |
tree | b63a179d3edeac66d84d403c6631303681bd7b51 /drivers/iommu/omap-iommu.c | |
parent | 7efe25a70c37395b41b034335345d6855926c2a6 (diff) | |
parent | 5c5c87411488af3cd082221e567498d813d0fe83 (diff) | |
parent | 379521462e4add27f3514da8e4ab1fd7a54fe1c7 (diff) | |
parent | d81dc82e0f19a3155935e10b752967335e6cbbef (diff) | |
parent | 04c532a1cdc7e423656c07937aa4b5c1c2b064f9 (diff) | |
parent | f1a066fcc9725960a73c00267afe7e346cc9fc6f (diff) | |
parent | d9737953d85131436b09668b5e8d3389c37c1f28 (diff) | |
parent | d88e61faad526a5850e9330c846641b91cf971e7 (diff) | |
download | linux-6488a7f35eeab463f6c9c2ea34d30ca856f0bc8e.tar.bz2 |
Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'arm/smmu', 'arm/omap', 'x86/amd', 'x86/vt-d' and 'core' into next