[U-Boot] [PULL] u-boot-usb/master

[Tom Rini]

On Tue, Apr 14, 2015 at 05:50:50AM +0200, Marek Vasut wrote:

> The following changes since commit f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
> 
>   Prepare v2015.04 (2015-04-13 10:53:03 -0400)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-usb.git HEAD
> 
> for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca:
> 
>   usb: gadget: thor: Claim EP after allocating it in thor gadget (2015-04-14 
> 05:48:12 +0200)
> 

So this and the DM pull request conflict pretty badly.  I can fixup
everything but common/usb_storage.c with a pretty good degree of
confidence.  But in that case it looks like DM is trying to do something
similar to what came in also via the USB tree (better / wider probing,
roughly).  How do you guys want to handle this?  Thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150415/968f11e9/attachment.sig>