On Fri, Aug 03, 2012 at 17:11:38, Daniel Mack wrote: > 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? > I have already pushed branch based on v3.6-rc1 (boot tested), https://github.com/hvaibhav/am335x-linux/tree/am335x-linux-next-master Thanks, Vaibhav -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html