diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-05-09 19:39:17 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-05-09 19:39:17 +0200 |
| commit | 6c0b43df74f900e7f31a49d1844f166df0f8afc6 (patch) | |
| tree | e91591771184559e78a57a4d4dd9178c547e2d20 /drivers/iommu/rockchip-iommu.c | |
| parent | e88ccab12a9e85c536544f1464bd75610b1c46d6 (diff) | |
| parent | 8d7f2d84ed2d44b05e1ce88fa4b74886af46a139 (diff) | |
| parent | a5c0e0b4ac07434056c5c4ecafeb9a5cff3d1a9d (diff) | |
| parent | 3d1a2442d2c08c872150db7a554647c06f6e864f (diff) | |
| parent | a0d284d2b1d9f7453ff1c5cc7854219daf4f7590 (diff) | |
| parent | d546635731317a5f8923b1045d0f4403e8024a7d (diff) | |
| parent | e85e8f69cedb5fbc7cd16f56dd97220e61ed616e (diff) | |
Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next