From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: wireless/wireless-current merge conflict
Date: Fri, 23 May 2008 13:37:15 +1000
Message-ID: <20080523133715.b42cb8e7.sfr@canb.auug.org.au>
References: <20080522132031.3c05b6f7.sfr@canb.auug.org.au>
	<20080522134105.GB3996@tuxdriver.com>
	<20080523093418.8c524267.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Fri__23_May_2008_13_37_15_+1000_Oa2yKKiboBgo=_sP"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:45246 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1762433AbYEWDh2 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 22 May 2008 23:37:28 -0400
In-Reply-To: <20080523093418.8c524267.sfr@canb.auug.org.au>
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>, Johannes Berg <johannes@sipsolutions.net>, linux-next@vger.kernel.org, Helmut Schaa <hschaa@suse.de>

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

Hi John,

On Fri, 23 May 2008 09:34:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> On Thu, 22 May 2008 09:41:05 -0400 "John W. Linville" <linville@tuxdriver=
.com> wrote:
> >
> > I have just pushed a 'merge-test' branch here:
> >=20
> > 	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2=
.6 merge-test
> >=20
> > You may wish to refer to it for the libertas conflict tomorrow.
>=20
> Thanks, I will have a look.

I got the conflict and fixed it up to match your test merge.  Thanks.

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

--Signature=_Fri__23_May_2008_13_37_15_+1000_Oa2yKKiboBgo=_sP
Content-Type: application/pgp-signature

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

iD4DBQFINjvvTgG2atn1QN8RAn0FAJ9E8rolpTSjkF+yltMfduiSXqCfQwCWNROO
zSWKaVJN8fc5pa0zjRFtkQ==
=DHCP
-----END PGP SIGNATURE-----

--Signature=_Fri__23_May_2008_13_37_15_+1000_Oa2yKKiboBgo=_sP--