From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1756035AbZLYAUH@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756035AbZLYAUH (ORCPT <rfc822;w@1wt.eu>);
	Thu, 24 Dec 2009 19:20:07 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755204AbZLYAUG
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 24 Dec 2009 19:20:06 -0500
Received: from chilli.pcug.org.au ([203.10.76.44]:57888 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755096AbZLYAUE (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 24 Dec 2009 19:20:04 -0500
Date: Fri, 25 Dec 2009 11:19:55 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Len Brown <lenb@kernel.org>
Cc: linux-next@vger.kernel.org,
       Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
       Stefani Seibold <stefani@seibold.net>,
       Andrew Morton <akpm@linux-foundation.org>,
       Dmitry Torokhov <dmitry.torokhov@gmail.com>,
       Mattia Dongili <malattia@linux.it>
Subject: Re: linux-next: manual merge of the acpi tree with Linus' tree
Message-Id: <20091225111955.ebd90b35.sfr@canb.auug.org.au>
In-Reply-To: <alpine.LFD.2.00.0912241502190.4159@localhost.localdomain>
References: <20091224091141.fa1cea64.sfr@canb.auug.org.au>
	<20091224093913.4f29f37b.sfr@canb.auug.org.au>
	<alpine.LFD.2.00.0912240000530.6541@localhost.localdomain>
	<20091224232656.dafb0b1d.sfr@canb.auug.org.au>
	<alpine.LFD.2.00.0912241502190.4159@localhost.localdomain>
X-Mailer: Sylpheed 3.0.0beta3 (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=_Fri__25_Dec_2009_11_19_55_+1100_gpbNK1rAIWTAAE0."
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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

Hi Len,

On Thu, 24 Dec 2009 15:05:06 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> FYI, I dropped that patch yesterday, and then just now included
> a refreshed patch from Dmitry.  So linux-next should be conflict free now.

Thanks.

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

--Signature=_Fri__25_Dec_2009_11_19_55_+1100_gpbNK1rAIWTAAE0.
Content-Type: application/pgp-signature

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

iEYEARECAAYFAks0BSsACgkQjjKRsyhoI8y+JgCgngyDWMKO9nN/106C8pP+/T8P
frEAoJ9QC69wpw0k2sLE9+aCZsUNukzK
=bMb5
-----END PGP SIGNATURE-----

--Signature=_Fri__25_Dec_2009_11_19_55_+1100_gpbNK1rAIWTAAE0.--