Merge branch 'master' of git://www.denx.de/git/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Mon, 15 Oct 2007 18:55:51 +0000 (20:55 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 15 Oct 2007 18:55:51 +0000 (20:55 +0200)

Trivial merge