Merge branch 'master' of git://git.denx.de/u-boot-usb
authorWolfgang Denk <wd@denx.de>
Mon, 13 Jul 2009 21:32:01 +0000 (23:32 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 13 Jul 2009 21:32:01 +0000 (23:32 +0200)

Trivial merge