Merge branch 'master' of /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Tue, 3 Aug 2010 20:45:13 +0000 (22:45 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 3 Aug 2010 20:45:13 +0000 (22:45 +0200)

Trivial merge