Merge branch 'master' of git://www.denx.de/git/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 21:41:02 +0000 (22:41 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 21:41:02 +0000 (22:41 +0100)

Trivial merge