From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Fri, 6 Jul 2012 18:39:54 +0000 (+0200)
Subject: Merge branch 'renesas-soc-core' into renesas-r8a7740
X-Git-Tag: v3.6-rc1~64^2~2^2~3^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f7d41217ba2bcdcd4f79e95f20f99074d87ac8c;p=pandora-kernel.git

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
---

2f7d41217ba2bcdcd4f79e95f20f99074d87ac8c
Reading git-diff-tree failed