Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Tue, 30 Dec 2008 22:22:19 +0000 (23:22 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 30 Dec 2008 22:22:19 +0000 (23:22 +0100)

Trivial merge