Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Sat, 9 Aug 2008 23:02:27 +0000 (01:02 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 9 Aug 2008 23:02:27 +0000 (01:02 +0200)

Trivial merge