Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Wed, 22 Sep 2010 20:36:42 +0000 (22:36 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 22 Sep 2010 20:36:42 +0000 (22:36 +0200)

Trivial merge