From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: wireless/wireless-current merge conflict Date: Fri, 23 May 2008 09:34:18 +1000 Message-ID: <20080523093418.8c524267.sfr@canb.auug.org.au> References: <20080522132031.3c05b6f7.sfr@canb.auug.org.au> <20080522134105.GB3996@tuxdriver.com> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__23_May_2008_09_34_18_+1000_ZnCFHsA1os3.BVac" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:60777 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753199AbYEVXeZ (ORCPT ); Thu, 22 May 2008 19:34:25 -0400 In-Reply-To: <20080522134105.GB3996@tuxdriver.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: "John W. Linville" Cc: David Miller , Johannes Berg , linux-next@vger.kernel.org, Helmut Schaa --Signature=_Fri__23_May_2008_09_34_18_+1000_ZnCFHsA1os3.BVac Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi John, On Thu, 22 May 2008 09:41:05 -0400 "John W. Linville" wrote: > > It sounds like you did the right fix. Did you hit one under Good. > drivers/net/wireless/libertas as well? No. > 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. Thanks, I will have a look. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__23_May_2008_09_34_18_+1000_ZnCFHsA1os3.BVac Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFINgL+TgG2atn1QN8RAsRxAJ49O1rldMze43C2KRsDLHDSvzyU8ACfUeMp vN5XJO0ow3kXCgsLHVSAQfA= =R2bP -----END PGP SIGNATURE----- --Signature=_Fri__23_May_2008_09_34_18_+1000_ZnCFHsA1os3.BVac--