Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 19:49:28 +0000 (21:49 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 19:49:28 +0000 (21:49 +0200)
commitb4039a54153994e7c9a9f1c42a2a70a9153b6587
tree8540fd9761fa24eb10ab65fdfa2cf42b4fbfb521
parent678150f155f0cc69ce7868f53d91e3ab2859510b
parent09c83a45b797aefbb41115af1b348494740460ce
Merge branch 'master' of git://git.denx.de/u-boot-usb