Merge branch 'socrates' of /home/wd/git/u-boot/projects
authorWolfgang Denk <wd@denx.de>
Tue, 20 May 2008 23:13:52 +0000 (01:13 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 20 May 2008 23:13:52 +0000 (01:13 +0200)

Trivial merge