git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
99cb9ae
263bc3f
1117588
e222d6a
2d565a5
cc4f14a
1c51099
18f2340
)
Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu',...
author
Joerg Roedel
<jroedel@suse.de>
Tue, 2 Dec 2014 12:07:13 +0000
(13:07 +0100)
committer
Joerg Roedel
<jroedel@suse.de>
Tue, 2 Dec 2014 12:07:13 +0000
(13:07 +0100)
Conflicts:
drivers/iommu/arm-smmu.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff