Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Fri, 21 Aug 2009 21:03:58 +0000 (23:03 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 21 Aug 2009 21:03:58 +0000 (23:03 +0200)
commitdb81c0d27654ed18b12ba94f05f9578294cb62ed
treeef3af435e6559eae353a07cb3af999da60d4b212
parent269610f6ba2e4a7bc27d2e53d43160614016964f
parentb1e849f2201bbbf3ca81fde164f154f9caf7f0e9
Merge branch 'master' of git://git.denx.de/u-boot-net