Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Tue, 21 Oct 2008 09:43:08 +0000 (11:43 +0200)
committerStefan Roese <sr@denx.de>
Tue, 21 Oct 2008 09:43:08 +0000 (11:43 +0200)

Trivial merge