Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Tue, 25 Aug 2009 20:51:40 +0000 (22:51 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 25 Aug 2009 20:51:40 +0000 (22:51 +0200)

Trivial merge