Re: 2.6.23-rc2-mm2
From: John W. Linville
Date: Fri Aug 10 2007 - 18:39:08 EST
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@xxxxxxxxxxxxx
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/