Merge branch 'renesas-soc-core' into renesas-r8a7740
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 6 Jul 2012 18:39:54 +0000 (20:39 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 6 Jul 2012 18:39:54 +0000 (20:39 +0200)
commit2f7d41217ba2bcdcd4f79e95f20f99074d87ac8c
treef2c9a82d4722fc7e04285a0f5393a6d9f8d848ea
parentd7de938f3da618b1592427f625e150c0a68b9ecb
parent8f45b112fc66ef6869ccca4c3966976982f496a9
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
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-sh73a0.c