git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1841ef1
e0809c9
)
Merge remote-tracking branch 'tero/for-v3.18/prcm-cleanup-v2' into omap-for-v3.17...
author
Tony Lindgren
<tony@atomide.com>
Mon, 29 Sep 2014 18:37:35 +0000
(11:37 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 29 Sep 2014 18:37:35 +0000
(11:37 -0700)
Conflicts:
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/prm3xxx.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff