From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of sparc tree Date: Wed, 18 Jun 2008 17:47:24 +1000 Message-ID: <20080618174724.62adc27f.sfr@canb.auug.org.au> References: <20080617172150.9ef1ea69.sfr@canb.auug.org.au> <20080617.003534.193689527.davem@davemloft.net> <20080617.223707.49467656.davem@davemloft.net> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__18_Jun_2008_17_47_24_+1000_q8HM7BPt/2m7XYu2" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:57097 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751945AbYFRHrc (ORCPT ); Wed, 18 Jun 2008 03:47:32 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Geert Uytterhoeven Cc: David Miller , linux-next@vger.kernel.org, bunk@kernel.org --Signature=_Wed__18_Jun_2008_17_47_24_+1000_q8HM7BPt/2m7XYu2 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, 18 Jun 2008 09:34:40 +0200 (CEST) Geert Uytterhoeven wrote: > > Never mind, I already added it to my tree. Probably yours will be > integrated in mainline earlier, so I'll just drop it at that time. Or Linus will do the same trivial conflict resolution I did and noone will even notice :-) --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__18_Jun_2008_17_47_24_+1000_q8HM7BPt/2m7XYu2 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkhYvYwACgkQTgG2atn1QN+MdACePydUqK1fWD5nTTlKIb4I/IJz A+gAnjGVuMOW0SMeoQPj0G2wuwGCH6MK =UkAn -----END PGP SIGNATURE----- --Signature=_Wed__18_Jun_2008_17_47_24_+1000_q8HM7BPt/2m7XYu2--