Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and...
authorJoerg Roedel <jroedel@suse.de>
Tue, 29 May 2018 14:58:17 +0000 (16:58 +0200)
committerJoerg Roedel <jroedel@suse.de>
Tue, 29 May 2018 14:58:17 +0000 (16:58 +0200)
commit1f568357117cafb48aafb10413cbd1567dc015b1
tree8169b7018a654fa7b24966f6465dd0017aef58d8
parentb04e217704b7f879c6b91222b066983a44a7a09f
parent4b123757eeaab1d522605b4469ee1adc18a80c90
parent7d1bf14f860230e9be5b0f183a2fbf10985fbc41
parent130a2fdf0b9e2305fd4dfbf7e6fb58c31df0fe8e
parentbb37f7db07293ec5bfc9b389948ea493b93028b7
parentea3fd04028cb9e317133e0f8794d15ad508489a8
parent1eefe5a034e3b9104f129ae4e8632838b8702a41
Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next
drivers/iommu/amd_iommu.c
drivers/iommu/dmar.c