From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: pending wireless/wireless-current merge conflict
Date: Thu, 29 May 2008 11:44:29 +1000
Message-ID: <20080529114429.da2ba7bd.sfr@canb.auug.org.au>
References: <20080522132031.3c05b6f7.sfr@canb.auug.org.au>
	<20080522134105.GB3996@tuxdriver.com>
	<20080529004251.GD22536@tuxdriver.com>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Thu__29_May_2008_11_44_29_+1000_LnVElNbeQjTn0qc="
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:52348 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755170AbYE2Boh (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 28 May 2008 21:44:37 -0400
In-Reply-To: <20080529004251.GD22536@tuxdriver.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: David Miller <davem@davemloft.net>, linux-next@vger.kernel.org

--Signature=_Thu__29_May_2008_11_44_29_+1000_LnVElNbeQjTn0qc=
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi John,

On Wed, 28 May 2008 20:42:51 -0400 "John W. Linville" <linville@tuxdriver.c=
om> wrote:
>
> 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:
>=20
> 	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6=
 merge-test-2
>=20
> 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.
>=20
> Just a heads-up... :-)

Thanks, I will keep a lookout.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Thu__29_May_2008_11_44_29_+1000_LnVElNbeQjTn0qc=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFIPgqBTgG2atn1QN8RAqoyAJ9O5UTgBE42fXraEIlXFb4yTYWILwCeIhnn
BWOfjF/wTcdk9ZRLsgG2khs=
=GKjm
-----END PGP SIGNATURE-----

--Signature=_Thu__29_May_2008_11_44_29_+1000_LnVElNbeQjTn0qc=--