]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
authorThierry Reding <treding@nvidia.com>
Wed, 26 Nov 2014 08:41:09 +0000 (09:41 +0100)
committerThierry Reding <treding@nvidia.com>
Wed, 26 Nov 2014 08:42:11 +0000 (09:42 +0100)
commita70928f3443e96ba4da4a6ff2b74574d4cb1c1fb
tree30cefbd6f503d20557e24a1765a027687170a7da
parent794664fc5e82534aa444b079f807e339c4d8d9b5
parent0b0e48ad34c27f14cb10149ebe2a783ef20237ea
Merge branch 'core' of git://git.kernel.org/pub/scm/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.