From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1758063AbYEAAhp@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758063AbYEAAhp (ORCPT <rfc822;w@1wt.eu>);
	Wed, 30 Apr 2008 20:37:45 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750794AbYEAAhf
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Wed, 30 Apr 2008 20:37:35 -0400
Received: from chilli.pcug.org.au ([203.10.76.44]:56190 "EHLO smtps.tip.net.au"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750785AbYEAAhe (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 30 Apr 2008 20:37:34 -0400
Date: Thu, 1 May 2008 10:37:27 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: LKML <linux-kernel@vger.kernel.org>, linux-next@vger.kernel.org,
       Andrew Morton <akpm@linux-foundation.org>,
       Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: v4l-dvb merge conflicts (Re: linux-next: upstream
 build failure: v4l/dvb)
Message-Id: <20080501103727.25929df2.sfr@canb.auug.org.au>
In-Reply-To: <20080430161224.71c154ca@gaivota>
References: <20080430114124.45017177.sfr@canb.auug.org.au>
	<20080429230040.45fc6a96@gaivota>
	<20080430134950.03b858e9.sfr@canb.auug.org.au>
	<20080430161224.71c154ca@gaivota>
X-Mailer: Sylpheed 2.5.0beta3 (GTK+ 2.12.9; i486-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Thu__1_May_2008_10_37_27_+1000_HZ.JOurTxiEe.n47"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--Signature=_Thu__1_May_2008_10_37_27_+1000_HZ.JOurTxiEe.n47
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Mauro,

On Wed, 30 Apr 2008 16:12:24 -0300 Mauro Carvalho Chehab <mchehab@infradead=
.org> wrote:
>=20
> Anyway, I've already dropped those patches that were already applied from=
 my
> tree. You should get a clean merge tomorrow.

Thanks.

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

--Signature=_Thu__1_May_2008_10_37_27_+1000_HZ.JOurTxiEe.n47
Content-Type: application/pgp-signature

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

iD8DBQFIGRDMTgG2atn1QN8RAgmbAJ9v2Kk9t8uhTIewSAHbnXUC1Bg72wCglNzi
FobKrXzPxWnE+Yp6Bn9qUbo=
=6V8s
-----END PGP SIGNATURE-----

--Signature=_Thu__1_May_2008_10_37_27_+1000_HZ.JOurTxiEe.n47--