Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Fri, 26 Nov 2010 20:52:30 +0000 (21:52 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 26 Nov 2010 20:52:30 +0000 (21:52 +0100)

Trivial merge