From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the slab tree
Date: Wed, 13 Aug 2008 17:40:16 +1000
Message-ID: <20080813174016.b0a317e3.sfr@canb.auug.org.au>
References: <20080813145741.43da1fc8.sfr@canb.auug.org.au>
	<48A28B6B.9030907@cs.helsinki.fi>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Wed__13_Aug_2008_17_40_16_+1000_TGV/1P9q9z8bN=Jh"
Return-path: <linux-next-owner@vger.kernel.org>
Received: from chilli.pcug.org.au ([203.10.76.44]:38389 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754901AbYHMHkX (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Wed, 13 Aug 2008 03:40:23 -0400
In-Reply-To: <48A28B6B.9030907@cs.helsinki.fi>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Christoph Lameter <cl@linux-foundation.org>, linux-next@vger.kernel.org, Randy Dunlap <randy.dunlap@oracle.com>, Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>

--Signature=_Wed__13_Aug_2008_17_40_16_+1000_TGV/1P9q9z8bN=Jh
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Pekka,

On Wed, 13 Aug 2008 10:21:15 +0300 Pekka Enberg <penberg@cs.helsinki.fi> wr=
ote:
>
> I've now fixed up the conflict in my tree. Thanks Stephen!

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

--Signature=_Wed__13_Aug_2008_17_40_16_+1000_TGV/1P9q9z8bN=Jh
Content-Type: application/pgp-signature

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

iEYEARECAAYFAkiij+AACgkQjjKRsyhoI8zSRwCdGOEdeepvb5jfrozlvnlShvey
M1wAoIYBGBMlvo1pR0SEV/RMoRwFxqyf
=BTxt
-----END PGP SIGNATURE-----

--Signature=_Wed__13_Aug_2008_17_40_16_+1000_TGV/1P9q9z8bN=Jh--