From: Mike Frysinger <vapier.adi@gmail.com>
Date: Wed, 8 Oct 2008 09:39:02 +0000 (+0800)
Subject: Blackfin arch: fix merge errors during 2.6.26 upgrade
X-Git-Tag: v2.6.28-rc1~604^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eb2c23f602ab35c5f4227bc87945a3c78a14150;p=pandora-kernel.git

Blackfin arch: fix merge errors during 2.6.26 upgrade

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---

Reading git-diff-tree failed