From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754956Ab0CKDEQ (ORCPT ); Wed, 10 Mar 2010 22:04:16 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:55202 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754557Ab0CKDEP (ORCPT ); Wed, 10 Mar 2010 22:04:15 -0500 Date: Thu, 11 Mar 2010 14:04:09 +1100 From: Stephen Rothwell To: Bruno Randolf Cc: "John W. Linville" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the wireless tree with the wireless-current tree Message-Id: <20100311140409.a9ae210c.sfr@canb.auug.org.au> In-Reply-To: <201003111138.12070.br1@einfach.org> References: <20100311131500.1057b6c5.sfr@canb.auug.org.au> <201003111138.12070.br1@einfach.org> X-Mailer: Sylpheed 3.0.0 (GTK+ 2.18.7; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__11_Mar_2010_14_04_09_+1100_lE0Zq70Wx563Q4N_" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Thu__11_Mar_2010_14_04_09_+1100_lE0Zq70Wx563Q4N_ Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Bruno, On Thu, 11 Mar 2010 11:38:11 +0900 Bruno Randolf wrote: > > not sure what happened... >=20 > but wireless-next-2.6.git 86415d43efd4f7093979cfa8a80232114266f1a4 is an = older=20 > version of my patch. i have sent one which applies cleanly later on. The tree I call wireless-current usually only contains bug fixes, the tree I call wireless is stuff for the next release ... > your fix is correct, though. Thanks for the confirmation. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__11_Mar_2010_14_04_09_+1100_lE0Zq70Wx563Q4N_ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkuYXakACgkQjjKRsyhoI8wRzACfe1iRvtix0X/a8GIjSCUr/zUO XfMAnizpvPZp7D3kF3zp2X8WZmNxjrBG =b6mR -----END PGP SIGNATURE----- --Signature=_Thu__11_Mar_2010_14_04_09_+1100_lE0Zq70Wx563Q4N_--