diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 20:39:54 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 20:39:54 +0200 |
| commit | 2f7d41217ba2bcdcd4f79e95f20f99074d87ac8c (patch) | |
| tree | f2c9a82d4722fc7e04285a0f5393a6d9f8d848ea /arch/arm/mach-shmobile/pfc-r8a7740.c | |
| parent | ARM: shmobile: use common DMAEngine definitions on r8a7740 (diff) | |
| parent | ARM: shmobile: soc-core: add R-mobile PM domain common APIs (diff) | |
| download | linux-2f7d41217ba2bcdcd4f79e95f20f99074d87ac8c.tar.xz linux-2f7d41217ba2bcdcd4f79e95f20f99074d87ac8c.zip | |
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
Diffstat (limited to 'arch/arm/mach-shmobile/pfc-r8a7740.c')
0 files changed, 0 insertions, 0 deletions