From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 26 Oct 2009 01:47:44 +0000 (+0900)
Subject: Merge branch 'sh/sdhi-mfd'
X-Git-Tag: v2.6.33-rc1~347^2~27^2~62
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15893fb565921507da80e500d85bb2575989bb57;p=pandora-kernel.git

Merge branch 'sh/sdhi-mfd'

Conflicts:
	arch/sh/boards/mach-ecovec24/setup.c
	arch/sh/boards/mach-kfr2r09/setup.c
---

15893fb565921507da80e500d85bb2575989bb57
Reading git-diff-tree failed