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)
commit0ad4770f8eb052a84800925ea4ab342cfc10dc32
treefa5f76ccbb17959c94b47e98548a95daf2144fa9
parenteddc7c46c6030d6eca29ac254c9db98198be572d
parent2f845dc2bdf461bfee9fa25823f769f5db9eba0b
Merge branch 'socrates' of /home/wd/git/u-boot/projects