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
This commit is contained in:
Rafael J. Wysocki 2012-07-11 23:01:33 +02:00
commit 992c91eeca
11 changed files with 334 additions and 6 deletions