Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Fri, 28 May 2010 17:47:15 +0000 (19:47 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 28 May 2010 17:47:15 +0000 (19:47 +0200)

Trivial merge