| commit | 2f7d41217ba2bcdcd4f79e95f20f99074d87ac8c | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rjw@sisk.pl> | Fri Jul 06 20:39:54 2012 +0200 |
| committer | Rafael J. Wysocki <rjw@sisk.pl> | Fri Jul 06 20:39:54 2012 +0200 |
| tree | f2c9a82d4722fc7e04285a0f5393a6d9f8d848ea | |
| parent | d7de938f3da618b1592427f625e150c0a68b9ecb [diff] | |
| parent | 8f45b112fc66ef6869ccca4c3966976982f496a9 [diff] |
Merge branch 'renesas-soc-core' into renesas-r8a7740 * 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