On Sat, Sep 22, 2012 at 01:09:27AM -0700, Olof Johansson wrote: > > I've pulled this in now as staging/imx-multiplatform. > > > > As you mention, it might or might not make sense to send this up. It > > also accrued a few more merge conflicts with other branches in > > arm-soc, so we'll see how things play out. > > > > Either way, we'll for sure queue it for 3.8. > > Hmm. Pulling it in gives me a few new build errors, in particular on > the configs that Russell use to build test omap3, as well as one of > his vexpress configs. So I dropped it again for now. > > Let's have the current contents sit in linux-next for at least one > release before we bring in anything more, especially since it brings > in dependencies on external trees, and it also has a handful of new > merge conflicts. We're already exposing Stephen Rothwell to more merge > conflicts than I'm entirely comfortable with. > Ok. I will rebase the series against 3.7-rc1 and then send you then. Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
