Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 18:58:51 +0000 (20:58 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 18:58:51 +0000 (20:58 +0200)

Trivial merge