Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into...
authorThierry Reding <treding@nvidia.com>
Tue, 4 Apr 2017 17:18:07 +0000 (19:18 +0200)
committerThierry Reding <treding@nvidia.com>
Tue, 4 Apr 2017 17:18:07 +0000 (19:18 +0200)

Trivial merge