From mboxrd@z Thu Jan  1 00:00:00 1970
From: "John W. Linville" <linville@tuxdriver.com>
Subject: linux-next: pending wireless/wireless-current merge conflict
	2008-07-08
Date: Tue, 8 Jul 2008 16:30:44 -0400
Message-ID: <20080708203044.GA6381@tuxdriver.com>
References: <20080702220212.GA31582@tuxdriver.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ra.tuxdriver.com ([70.61.120.52]:4994 "EHLO ra.tuxdriver.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750843AbYGHVIF (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 8 Jul 2008 17:08:05 -0400
Content-Disposition: inline
In-Reply-To: <20080702220212.GA31582@tuxdriver.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>, linux-next@vger.kernel.org, linux-wireless@vger.kernel.org

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
linville@tuxdriver.com