Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Tue, 10 Aug 2010 20:57:54 +0000 (22:57 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 10 Aug 2010 20:57:54 +0000 (22:57 +0200)
commit42441b8a1a3e8b42459de60bbec6833a31cd6cd5
treeceaa454a2a57fff3c3a64bf6f1637d61eb54672e
parentfc21cd552bf7845fd2002e7a090d53ee5d12d335
parentd7fb9bcfb29a1cbdbda7006658e76c2d9da0f66f
Merge branch 'master' of git://git.denx.de/u-boot-net