Subject: linux-next: pending wireless/wireless-current merge conflict

From: "John W. Linville" <[email-masked]>
Date: Wed, 25 Jun 2008 14:04:30 -0400

I just sent a pull request for Dave that will result in nasty-looking
conflict in iwl4965-base.c.  I have a sample merge available here:

	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test

The overview of the resolution is to ignore any changes in
iwl4965-base.c and take drivers/net/wireless/iwlwifi/iwl-scan.c from
the URL above.

Just a heads-up... :-)

John

P.S.  Hopefully the iwlwifi guys will double check the accuracy of
my fix-up...
-- 
John W. Linville
[email-masked]