Merge branch 'master' of /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Wed, 18 Aug 2010 19:19:00 +0000 (21:19 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 18 Aug 2010 19:19:00 +0000 (21:19 +0200)

Trivial merge