Merge branch 'master' of /home/wd/git/u-boot/master/
authorWolfgang Denk <wd@denx.de>
Mon, 18 Oct 2010 20:29:40 +0000 (22:29 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 18 Oct 2010 20:29:40 +0000 (22:29 +0200)

Trivial merge