git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6b6d62e
c9d501e
)
Merge branch 'omap-for-v3.8/cleanup-prcm' into omap-for-v3.8/tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Fri, 9 Nov 2012 23:22:58 +0000
(15:22 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 9 Nov 2012 23:22:58 +0000
(15:22 -0800)
Conflicts:
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/prm_common.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff