Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Fri, 19 Nov 2010 21:00:28 +0000 (22:00 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 19 Nov 2010 21:00:28 +0000 (22:00 +0100)

Trivial merge