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

Trivial merge