From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 10 May 2012 08:20:56 +0000 (+0900)
Subject: Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest
X-Git-Tag: v3.5-rc1~134^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcb86e0adb6397013616567249d2d82f94b27891;p=pandora-kernel.git

Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest

Conflicts:
	arch/sh/Kconfig

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

bcb86e0adb6397013616567249d2d82f94b27891
Reading git-diff-tree failed