Merge branch 'pr-15052014' of git://git.denx.de/u-boot-usb