Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Mon, 5 May 2008 11:25:04 +0000 (13:25 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 5 May 2008 11:25:04 +0000 (13:25 +0200)

Trivial merge