Merge branch 'master' of /home/wd/git/u-boot/master/
authorWolfgang Denk <wd@denx.de>
Wed, 21 Jul 2010 20:23:26 +0000 (22:23 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 21 Jul 2010 20:23:26 +0000 (22:23 +0200)

Trivial merge