Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Tue, 12 Oct 2010 18:44:46 +0000 (20:44 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 12 Oct 2010 18:44:46 +0000 (20:44 +0200)
commit0ee8746a93e29a3d884f19598409a3bea8ff51ab
tree1544d350005f0ff1403c21e2c795575e51901ae1
parent456be17dbe0e22ee2be9fafa1ea8888ddf6bd514
parent1ca6d0df3ecb028e989f3489b95d021f4497477b
Merge branch 'master' of git://git.denx.de/u-boot-net