Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Sun, 10 Apr 2011 19:06:27 +0000 (21:06 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 10 Apr 2011 19:06:27 +0000 (21:06 +0200)

Trivial merge