Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 18:57:34 +0000 (20:57 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 18:57:34 +0000 (20:57 +0200)

Trivial merge