Merge branch 'master' of git://www.denx.de/git/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Wed, 26 Mar 2008 23:16:18 +0000 (00:16 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 26 Mar 2008 23:16:18 +0000 (00:16 +0100)

Trivial merge