From: John W. Linville <hidden> Date: 2007-08-10 22:39:06
Also in:lkml
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