projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f114040 0690cbd)
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)
commit7f06dd61248a75668bbb39b6fcca6ff407745df8
tree30cefbd6f503d20557e24a1765a027687170a7datree | snapshot
parentf114040e3ea6e07372334ade75d1ee0775c355e1commit | diff
parent0690cbd2e55a72a8eae557c389d1a136ed9fa142commit | diff
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.
John Crispins staging tree