Merge branch 'renesas-soc-core' into renesas-soc
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:01:33 +0000 (23:01 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:01:33 +0000 (23:01 +0200)
commit992c91eeca5fc7249de6afbba49064640f620d4a
treea1c1ed65f916757df41b9960f9224854d2a1f2fd
parent31400bb56c0a6e55cd1e8f427f5ffcff2befcac4
parent8f45b112fc66ef6869ccca4c3966976982f496a9
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
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-sh73a0.c