Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754662AbZKQIKF (ORCPT ); Tue, 17 Nov 2009 03:10:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753031AbZKQIKE (ORCPT ); Tue, 17 Nov 2009 03:10:04 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:42621 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752488AbZKQIKC (ORCPT ); Tue, 17 Nov 2009 03:10:02 -0500 Date: Tue, 17 Nov 2009 19:10:01 +1100 From: Stephen Rothwell To: David Miller Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, w.sang@pengutronix.de, chripell@fsfe.org, wg@grandegger.com, anantgole@ti.com, oliver@hartkopp.net Subject: Re: linux-next: manual merge of the net tree with the net-current tree Message-Id: <20091117191001.ba8de1d0.sfr@canb.auug.org.au> In-Reply-To: <20091117.000720.01506428.davem@davemloft.net> References: <20091117131637.3a35f898.sfr@canb.auug.org.au> <20091117.000720.01506428.davem@davemloft.net> 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__17_Nov_2009_19_10_01_+1100_=ysVCPvPnbT09.jN" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1292 Lines: 42 --Signature=_Tue__17_Nov_2009_19_10_01_+1100_=ysVCPvPnbT09.jN Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Dave, On Tue, 17 Nov 2009 00:07:20 -0800 (PST) David Miller = wrote: > > From: Stephen Rothwell > Date: Tue, 17 Nov 2009 13:16:37 +1100 >=20 > > I fixed it up (see below) and can carry the fix for a while. (I am not > > sure the fix is entirely correct.) >=20 > I'll merge net-2.6 into net-next-2.6 so you won't see this tomorrow. Great, thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Tue__17_Nov_2009_19_10_01_+1100_=ysVCPvPnbT09.jN Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAksCWlkACgkQjjKRsyhoI8yGlACcCkbkZK9fLmHlxPMc4B4GxVwj /jEAoLo+VM+xthRqqmiFYfpIwMFYtVeF =I8Lr -----END PGP SIGNATURE----- --Signature=_Tue__17_Nov_2009_19_10_01_+1100_=ysVCPvPnbT09.jN-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/