Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Sun, 4 Jul 2010 21:36:11 +0000 (23:36 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 4 Jul 2010 21:36:11 +0000 (23:36 +0200)

Trivial merge