Re: 2.6.23-rc2-mm2

John W. Linville
2007-08-10T22:39:06Z

On Fri, Aug 10, 2007 at 01:20:19PM -0700, Andrew Morton wrote:

> git-wireless now has the usual git catastrophe when merging it against the
> recently-discovered net-2.6.24 tree, so I'll need to do something about
> that first.

I have rebased the wireless-dev tree, and the mm-master branch there
should specifically avoid these merge conflicts.

Hth!

John
--
John W. Linville
linville@tuxdriver.com