From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1755549Ab0ARI7M@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755549Ab0ARI7M (ORCPT <rfc822;w@1wt.eu>);
	Mon, 18 Jan 2010 03:59:12 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754739Ab0ARI7L
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 18 Jan 2010 03:59:11 -0500
Received: from chilli.pcug.org.au ([203.10.76.44]:49422 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754430Ab0ARI7J (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 18 Jan 2010 03:59:09 -0500
Date: Mon, 18 Jan 2010 19:59:04 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>,
       Peter Zijlstra <peterz@infradead.org>, linux-next@vger.kernel.org,
       linux-kernel@vger.kernel.org, Jan Kiszka <jan.kiszka@siemens.com>,
       Steven Rostedt <rostedt@goodmis.org>,
       Wolfram Sang <w.sang@pengutronix.de>
Subject: Re: linux-next: manual merge of the tip tree with Linus' tree
Message-Id: <20100118195904.07c77596.sfr@canb.auug.org.au>
In-Reply-To: <20100118075025.GA22476@elte.hu>
References: <20100118180841.96628ee6.sfr@canb.auug.org.au>
	<20100118075025.GA22476@elte.hu>
X-Mailer: Sylpheed 3.0.0beta4 (GTK+ 2.18.5; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Mon__18_Jan_2010_19_59_04_+1100_pMMQ6W6/XJHfww1k"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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

Hi Ingo,

On Mon, 18 Jan 2010 08:50:25 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> FYI, i resolved the conflict already in tip:master yesterday, a bit=20
> differently.

Excellent, thanks.

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

--Signature=_Mon__18_Jan_2010_19_59_04_+1100_pMMQ6W6/XJHfww1k
Content-Type: application/pgp-signature

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

iEYEARECAAYFAktUItgACgkQjjKRsyhoI8z97QCfR/AoJ+apLPvqnW91ZJ4IyiVk
0Y4An1HenitllvD3ktuOlCE16NfXYDEE
=8D8p
-----END PGP SIGNATURE-----

--Signature=_Mon__18_Jan_2010_19_59_04_+1100_pMMQ6W6/XJHfww1k--