From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754381Ab0BSDqa (ORCPT ); Thu, 18 Feb 2010 22:46:30 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:44729 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754233Ab0BSDq2 (ORCPT ); Thu, 18 Feb 2010 22:46:28 -0500 Date: Fri, 19 Feb 2010 14:46:17 +1100 From: Stephen Rothwell To: Jonathan Cameron Cc: Zhang Rui , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alan Jenkins Subject: Re: linux-next: manual merge of the als tree with Linus' tree Message-Id: <20100219144617.beac04cf.sfr@canb.auug.org.au> In-Reply-To: <4B7D59C3.90301@cam.ac.uk> References: <20100218171147.973d1016.sfr@canb.auug.org.au> <4B7D59C3.90301@cam.ac.uk> X-Mailer: Sylpheed 3.0.0beta7 (GTK+ 2.18.6; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__19_Feb_2010_14_46_17_+1100_HnrN.NIUPwV6in.4" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Fri__19_Feb_2010_14_46_17_+1100_HnrN.NIUPwV6in.4 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jonathan, On Thu, 18 Feb 2010 15:16:19 +0000 Jonathan Cameron wrote: > > I've reset that last patch, merged Linus' current tree and reapplied it o= n top with the > merge problems fixed up. While I was there I edited the commit message s= o it was actually > English (oops). >=20 > Anyhow, (fingers crossed), it should now work fine. Thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__19_Feb_2010_14_46_17_+1100_HnrN.NIUPwV6in.4 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkt+CYkACgkQjjKRsyhoI8z5twCfSFaxuPJCN2b03ETWbziR3tdw lGcAnikP0wJ0NzLZQJZEqPJPdJlAGBhz =pgtC -----END PGP SIGNATURE----- --Signature=_Fri__19_Feb_2010_14_46_17_+1100_HnrN.NIUPwV6in.4--