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

From: "John W. Linville" <[email-masked]>
Date: Fri, 13 Jun 2008 17:56:01 -0400

I just sent a pull request for Dave that will result in some conflict
around 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

Just a heads-up... :-)

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