git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
509fca8
2f119c7
d4b0366
b61e2e6
804cb54
89be34a
)
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and...
author
Joerg Roedel
<jroedel@suse.de>
Thu, 2 Apr 2015 11:33:19 +0000
(13:33 +0200)
committer
Joerg Roedel
<jroedel@suse.de>
Thu, 2 Apr 2015 11:33:19 +0000
(13:33 +0200)
Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/tegra-gart.c
drivers/iommu/tegra-smmu.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff