Merge branch 'master' of /home/wd/git/u-boot/master/
authorWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 20:34:46 +0000 (21:34 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 20:34:46 +0000 (21:34 +0100)

Trivial merge