From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 11 Jul 2012 21:01:33 +0000 (+0200)
Subject: Merge branch 'renesas-soc-core' into renesas-soc
X-Git-Tag: v3.6-rc1~64^2~2^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=992c91eeca5fc7249de6afbba49064640f620d4a;p=pandora-kernel.git

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

992c91eeca5fc7249de6afbba49064640f620d4a
Reading git-diff-tree failed