Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Sun, 15 Feb 2009 21:55:56 +0000 (22:55 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 15 Feb 2009 21:55:56 +0000 (22:55 +0100)

Trivial merge