Hi Josh, On Thu, 8 Dec 2011 20:46:39 -0500 Josh Boyer <jwbo...@gmail.com> wrote: > > I blame BenH. I sent him a pull request with d5b9ee7b514e in it > before he went and updated his tree. Still not pulled afaik. Guess > I'll be rebasing my next branch tomorrow to pick up a series from Tony > Breeds, unless Ben handles the outstanding pull before I wake up :).
Don't bother rebasing, let Ben handle the conflict in the merge. -- Cheers, Stephen Rothwell s...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
pgpcBeCQ1LEYz.pgp
Description: PGP signature
_______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
