[PATCH v7 00/11] usb: musb: adding multi instance support

Daniel Mack zonque at gmail.com
Fri Aug 3 21:41:38 EST 2012


On 03.08.2012 11:07, Hiremath, Vaibhav wrote:
> I have just pushed the code (V7 which Ravi submitted), so can you please try 
> with below branch? 
> 
> https://github.com/hvaibhav/am335x-linux/tree/am335x-upstream-staging-usb

Thanks for doing this, but I'm unfortunately getting tons of merge
conflicts when I try to put this on top of 3.6-rc1. Still pondering
which way around is the easiest to get this solved.

OTOH, I wonder whether your staging branches would need to rebased
sooner or later anyway?


Daniel



More information about the devicetree-discuss mailing list