On Wed, 24 Feb 2010, Paul Walmsley wrote: > On Wed, 24 Feb 2010, Tony Lindgren wrote: > > > * Paul Walmsley <[email protected]> [100224 10:15]: > > > > > > Hi Tony, > > > > > > The following changes since commit > > > 0482e3c6f704d25b6a4e3c940caeeacece4e6d74: > > > Tony Lindgren (1): > > > Merge branch 'omap-fixes-for-linus' into omap-for-linus > > > > > > are available in the git repository at: > > > > > > git://git.pwsan.com/linux-2.6 for_2.6.34_b > > > > Hmm this does not seem to merge without conflicts to omap-for-linus, > > maybe take a look if you can merge/rebase it? > > > > I'd assume rebasing or merging your branch with > > 80c20d543d142ee54ec85259b77aaf0b83c32db5 will do the trick. > > Looks like 4751227df948582e82f19df30efa662ab71fa980 is the problem.
Cool, it turned out to be not too bad to rebase. for_2.6.34_b branch is updated. I'll retest here and resend a pull request after the tests are complete. - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
