From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753207AbZK3TzL (ORCPT ); Mon, 30 Nov 2009 14:55:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752854AbZK3TzK (ORCPT ); Mon, 30 Nov 2009 14:55:10 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:48139 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752501AbZK3TzJ (ORCPT ); Mon, 30 Nov 2009 14:55:09 -0500 Date: Tue, 1 Dec 2009 06:55:11 +1100 From: Stephen Rothwell To: Jiri Kosina Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Hutchings , "David S. Miller" , =?UTF-8?B?IkFuZHLDqSBHb2RkYXJkIFJvc2Ei?= Subject: Re: linux-next: manual merge of the trivial tree with the net tree Message-Id: <20091201065511.37da12f1.sfr@canb.auug.org.au> In-Reply-To: References: <20091130135320.215722a2.sfr@canb.auug.org.au> 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=_Tue__1_Dec_2009_06_55_11_+1100_t2pJaNJXJIVWkxP5" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Tue__1_Dec_2009_06_55_11_+1100_t2pJaNJXJIVWkxP5 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jiri, On Mon, 30 Nov 2009 13:36:18 +0100 (CET) Jiri Kosina wrot= e: > > Dropped the falcon.c hunk from the pile, so the conflict should be gone. Thanks for that. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__1_Dec_2009_06_55_11_+1100_t2pJaNJXJIVWkxP5 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAksUIx8ACgkQjjKRsyhoI8zMmgCfe42XHs3fh7jj1jOUKUJ7tcur VLYAoLIFE308zFecDg9ZpVxL/gTE6Xg8 =v+7V -----END PGP SIGNATURE----- --Signature=_Tue__1_Dec_2009_06_55_11_+1100_t2pJaNJXJIVWkxP5--