Rafael J. Wysocki 2f7d41217b 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

2012-07-06 20:39:54 +02:00

..

mach

Merge branch 'renesas-soc-core' into renesas-r8a7740

2012-07-06 20:39:54 +02:00