From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1757468AbZHHAqm@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757468AbZHHAqm (ORCPT <rfc822;w@1wt.eu>);
	Fri, 7 Aug 2009 20:46:42 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755263AbZHHAql
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Fri, 7 Aug 2009 20:46:41 -0400
Received: from chilli.pcug.org.au ([203.10.76.44]:56096 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755196AbZHHAqk (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 7 Aug 2009 20:46:40 -0400
Date: Sat, 8 Aug 2009 10:46:33 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
       Joe Perches <joe@perches.com>,
       Andrew Morton <akpm@linux-foundation.org>,
       Markus Heidelberg <markus.heidelberg@web.de>
Subject: Re: linux-next: manual merge of the trivial tree with the  tree
Message-Id: <20090808104633.48f086e0.sfr@canb.auug.org.au>
In-Reply-To: <alpine.LNX.2.00.0908080212320.25797@wotan.suse.de>
References: <20090731143912.7a6afdbb.sfr@canb.auug.org.au>
	<alpine.LNX.2.00.0908080212320.25797@wotan.suse.de>
X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.5; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Sat__8_Aug_2009_10_46_33_+1000_GY5X2oIby6jRh.H4"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--Signature=_Sat__8_Aug_2009_10_46_33_+1000_GY5X2oIby6jRh.H4
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jiri,

On Sat, 8 Aug 2009 02:13:36 +0200 (CEST) Jiri Kosina <jkosina@suse.cz> wrot=
e:
>
> [ sorry for late reply, have been on vacation, totally offline, for two=20
>   weeks ]

Hey, no worries :-)

> I have fast-forwarded the 'for-next' branch of trivial tree and fixed the=
=20
> conflict, so it should be OK the next time you pull.

Thanks.

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

--Signature=_Sat__8_Aug_2009_10_46_33_+1000_GY5X2oIby6jRh.H4
Content-Type: application/pgp-signature

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

iEYEARECAAYFAkp8yukACgkQjjKRsyhoI8z3hACfUYNSCU2Ezdwqewijnz43JSj3
i/4AnRepJA/QTBrjckTH0AQj5KJnSvA7
=4+qT
-----END PGP SIGNATURE-----

--Signature=_Sat__8_Aug_2009_10_46_33_+1000_GY5X2oIby6jRh.H4--