From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 12 Jan 2012 03:57:32 +0000 (+0900)
Subject: Merge branch 'sh/pm-runtime' into sh-latest
X-Git-Tag: v3.3-rc1~91^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f06cf38eca57e279b4c78e465e19f10c2f78174;p=pandora-kernel.git

Merge branch 'sh/pm-runtime' into sh-latest

Conflicts:
	arch/sh/kernel/cpu/sh4a/clock-sh7723.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

9f06cf38eca57e279b4c78e465e19f10c2f78174
Reading git-diff-tree failed