Merge branch 'master' of /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Tue, 21 Sep 2010 07:34:16 +0000 (09:34 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 21 Sep 2010 07:34:16 +0000 (09:34 +0200)

Trivial merge