From: Thierry Reding Date: Wed, 26 Nov 2014 08:41:09 +0000 (+0100) Subject: Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7f06dd61248a75668bbb39b6fcca6ff407745df8;p=deliverable%2Flinux.git Merge branch 'core' of git://git./linux/kernel/git/joro/iommu This branch contains a couple of changes that will conflict with the Tegra SMMU driver rewrite. Since the driver is largely rewritten the conflict resolution is non-trivial. --- 7f06dd61248a75668bbb39b6fcca6ff407745df8