Blackfin arch: fix merge errors during 2.6.26 upgrade
authorMike Frysinger <vapier.adi@gmail.com>
Wed, 8 Oct 2008 09:39:02 +0000 (17:39 +0800)
committerBryan Wu <cooloney@kernel.org>
Wed, 8 Oct 2008 09:39:02 +0000 (17:39 +0800)
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

No differences found