diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:01:33 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:01:33 +0200 |
| commit | 992c91eeca5fc7249de6afbba49064640f620d4a (patch) | |
| tree | a1c1ed65f916757df41b9960f9224854d2a1f2fd /scripts | |
| parent | Merge branch 'renesas-fixes' into renesas-soc (diff) | |
| parent | ARM: shmobile: soc-core: add R-mobile PM domain common APIs (diff) | |
| download | linux-992c91eeca5fc7249de6afbba49064640f620d4a.tar.gz linux-992c91eeca5fc7249de6afbba49064640f620d4a.zip | |
Merge branch 'renesas-soc-core' into renesas-soc
* 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
ARM: shmobile: add common DMAEngine definitions
ARM: shmobile: add common extra gpio functions
Conflicts:
arch/arm/mach-shmobile/clock-r8a7740.c
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions