From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1751490AbZJaEaK@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751490AbZJaEaK (ORCPT <rfc822;w@1wt.eu>);
	Sat, 31 Oct 2009 00:30:10 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750933AbZJaEaI
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 31 Oct 2009 00:30:08 -0400
Received: from chilli.pcug.org.au ([203.10.76.44]:52773 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750886AbZJaEaH (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sat, 31 Oct 2009 00:30:07 -0400
Date: Sat, 31 Oct 2009 15:30:04 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org, linux-next@vger.kernel.org,
       linux-kernel@vger.kernel.org,
       Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>,
       Alexander Shishkin <virtuoso@slind.org>,
       Ladislav Michl <ladis@linux-mips.org>
Subject: Re: linux-next: manual merge of the omap tree with Linus' tree
Message-Id: <20091031153004.3544e6df.sfr@canb.auug.org.au>
In-Reply-To: <20091030144517.GS7180@atomide.com>
References: <20091030114642.61bbeb2c.sfr@canb.auug.org.au>
	<20091030144517.GS7180@atomide.com>
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=_Sat__31_Oct_2009_15_30_04_+1100_cPxoidJa9mJjDgP+"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--Signature=_Sat__31_Oct_2009_15_30_04_+1100_cPxoidJa9mJjDgP+
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Tony,

On Fri, 30 Oct 2009 07:45:18 -0700 Tony Lindgren <tony@atomide.com> wrote:
>
> Thanks, will rebase omap for-next patches today.

Or you could just do a merge with Linus' tree (or the part of Linus' tree
that you clash with) ...

But thanks either way.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Sat__31_Oct_2009_15_30_04_+1100_cPxoidJa9mJjDgP+
Content-Type: application/pgp-signature

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

iEYEARECAAYFAkrrvUwACgkQjjKRsyhoI8wMzACgmQ6Obmg/mQ831VzE8efyhB2z
mycAnjuuavWZJ2h9LZdoowKo5rw0eaSn
=Y9oU
-----END PGP SIGNATURE-----

--Signature=_Sat__31_Oct_2009_15_30_04_+1100_cPxoidJa9mJjDgP+--