From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 20 Oct 2008 02:37:58 +0000 (+0900)
Subject: sh: Fix up some merge damage.
X-Git-Tag: v2.6.28-rc1~99^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a19eb2a6607f2f6329efb3c4637fe23afae2cd7;p=pandora-kernel.git

sh: Fix up some merge damage.

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

Reading git-diff-tree failed