git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d7de938
8f45b11
)
Merge branch 'renesas-soc-core' into renesas-r8a7740
author
Rafael J. Wysocki
<rjw@sisk.pl>
Fri, 6 Jul 2012 18:39:54 +0000
(20:39 +0200)
committer
Rafael J. Wysocki
<rjw@sisk.pl>
Fri, 6 Jul 2012 18:39:54 +0000
(20:39 +0200)
* renesas-soc-core:
ARM: shmobile: soc-core: add R-mobile PM domain common APIs
ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register
Conflicts:
arch/arm/mach-shmobile/clock-r8a7740.c
Trivial merge