Caught up with wireless-2.6

[David Woodhouse]

On Sat, 2007-05-26 at 00:47 -0400, Dan Williams wrote:
> Once the changes are in wireless-2.6, we will rebase libertas-2.6 to
> wireless-2.6.  We should send all patches to Linville and the
> linux-wireless mailing list from now on, and keep libertas-2.6 as a more
> experimental tree.  This does mean that more people will look at and
> comment on patches we all will send, but we should take that as a _good_
> thing and fix our patches as appropriate.

I would recommend that you _either_ keep libertas-2.6 as a tree which
John can pull from directly into wireless-2.6, or abandon it completely.
If you keep it around as a tree to which you can commit temporary hacks,
you _will_ end up with another evil manual merge to do.

-- 
dwmw2