From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1756237AbZKQXim@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756237AbZKQXim (ORCPT <rfc822;w@1wt.eu>);
	Tue, 17 Nov 2009 18:38:42 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755105AbZKQXil
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 17 Nov 2009 18:38:41 -0500
Received: from chilli.pcug.org.au ([203.10.76.44]:36412 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753650AbZKQXik (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 17 Nov 2009 18:38:40 -0500
Date: Wed, 18 Nov 2009 10:38:40 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
       =?UTF-8?B?IkFuZHLDqSBHb2RkYXJkIFJvc2Ei?= <andre.goddard@gmail.com>,
       Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
       "John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the trivial tree with the wireless
 tree
Message-Id: <20091118103840.ae9d66ad.sfr@canb.auug.org.au>
In-Reply-To: <alpine.LSU.2.00.0911172317560.15039@wotan.suse.de>
References: <20091117154957.a23c959b.sfr@canb.auug.org.au>
	<alpine.LSU.2.00.0911172317560.15039@wotan.suse.de>
X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.3; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Wed__18_Nov_2009_10_38_40_+1100_2E.aJvEyhHayUmPW"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--Signature=_Wed__18_Nov_2009_10_38_40_+1100_2E.aJvEyhHayUmPW
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jiri,

On Tue, 17 Nov 2009 23:18:25 +0100 (CET) Jiri Kosina <jkosina@suse.cz> wrot=
e:
>
> Thanks for letting me know, I have dropped the rt2800usb bits from my=20
> queue, so this conflict should now be gone.

Great, thanks.

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

--Signature=_Wed__18_Nov_2009_10_38_40_+1100_2E.aJvEyhHayUmPW
Content-Type: application/pgp-signature

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

iEYEARECAAYFAksDNAEACgkQjjKRsyhoI8w0AQCbB7WSIYJYJotQ67GDobK4RJFc
65UAoKEYwPhSD4jtHfQ/XA5Fhzm0Pj7b
=Kbp+
-----END PGP SIGNATURE-----

--Signature=_Wed__18_Nov_2009_10_38_40_+1100_2E.aJvEyhHayUmPW--