Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Mon, 20 Jul 2009 20:55:29 +0000 (22:55 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 20 Jul 2009 20:55:29 +0000 (22:55 +0200)

Trivial merge