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

From: "John W. Linville" <[email-masked]>
Date: Wed, 28 May 2008 20:42:51 -0400

I just sent a pull request for Dave that will result in a conflict
in the rt2x00 driver.  I have a sample merge available here:

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

Please note the 'merge-test-2' -- I still have the old merge-test
there since Dave hadn't (at my last check anyway) yet pulled the
previous wireless-next-2.6 request into net-next-2.6.

Just a heads-up... :-)

John
-- 
John W. Linville
[email-masked]