git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fe82dce
f171aba
a6fda0f
dedd943
80f7b3d
c50e324
5fc24d8
)
Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core...
author
Joerg Roedel
<jroedel@suse.de>
Thu, 2 Oct 2014 10:24:45 +0000
(12:24 +0200)
committer
Joerg Roedel
<jroedel@suse.de>
Thu, 2 Oct 2014 10:24:45 +0000
(12:24 +0200)
Conflicts:
drivers/iommu/arm-smmu.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff