diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:41:09 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:42:11 +0100 |
| commit | 7f06dd61248a75668bbb39b6fcca6ff407745df8 (patch) | |
| tree | 30cefbd6f503d20557e24a1765a027687170a7da /drivers/amba | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
| parent | 0690cbd2e55a72a8eae557c389d1a136ed9fa142 (diff) | |
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.
Diffstat (limited to 'drivers/amba')
0 files changed, 0 insertions, 0 deletions