Merge branch 'pr-15052014' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@ti.com>
Thu, 22 May 2014 17:42:26 +0000 (13:42 -0400)
committerTom Rini <trini@ti.com>
Thu, 22 May 2014 17:42:26 +0000 (13:42 -0400)

Trivial merge