Subject: linux-next: pending wireless/wireless-current merge conflict 2008-07-08

From: "John W. Linville" <[email-masked]>
Date: Tue, 8 Jul 2008 16:30:44 -0400

I just sent a pull request for Dave that will result in a merge
conflict in linux-next.  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

P.S.  These are one-liners (including the one from yesterday).
Nevertheless, it can't hurt to provide a reference "just in
case"... :-)
-- 
John W. Linville
[email-masked]