Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Wed, 13 Apr 2011 20:04:11 +0000 (22:04 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 13 Apr 2011 20:04:11 +0000 (22:04 +0200)

Trivial merge