On Wed, 2008-07-09 at 17:34 +1000, Benjamin Herrenschmidt wrote: > > It contains 3 branches: > > - merge : this is for merging with the current stable and doesn't > currently contain anything interesting > > - master : this is our current "powerpc.git" tree, it may contain > various experimental stuff that may or may not go upstream > or may contain dependent patches that we rely on but that > are to be merged via some other tree. > > - next : this is the candidate stuff for linux-next and the next > merge window
-next and -merge are now both to the same level, which is the same as I pushed last week plus a merge with 2.6.26 to resolve a conflict. I'll start putting new stuff in tomorrow if all goes well. Cheers, Ben. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
