From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 9 Jan 2012 01:03:09 +0000 (+0900)
Subject: Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen
X-Git-Tag: v3.3-rc1~90^2~2^3~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9;p=pandora-kernel.git

Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen

Conflicts:
	arch/arm/mach-shmobile/clock-sh73a0.c

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

e0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9
Reading git-diff-tree failed