git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bb590c9
a4188be
1d7f449
cd70d46
ae0cbbb
63ce3ae
)
Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and ...
author
Joerg Roedel
<jroedel@suse.de>
Wed, 4 Feb 2015 15:53:44 +0000
(16:53 +0100)
committer
Joerg Roedel
<jroedel@suse.de>
Wed, 4 Feb 2015 15:53:44 +0000
(16:53 +0100)
Conflicts:
drivers/iommu/Kconfig
drivers/iommu/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff