Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Tue, 3 Feb 2009 22:16:15 +0000 (23:16 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 3 Feb 2009 22:16:15 +0000 (23:16 +0100)

Trivial merge