Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Tue, 9 Jun 2009 20:53:03 +0000 (22:53 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 9 Jun 2009 20:53:03 +0000 (22:53 +0200)

Trivial merge