git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f114040
0690cbd
)
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
author
Thierry Reding
<treding@nvidia.com>
Wed, 26 Nov 2014 08:41:09 +0000
(09:41 +0100)
committer
Thierry Reding
<treding@nvidia.com>
Wed, 26 Nov 2014 08:42:11 +0000
(09:42 +0100)
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.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff