From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753581Ab0ELAXX (ORCPT ); Tue, 11 May 2010 20:23:23 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:46742 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751439Ab0ELAXW (ORCPT ); Tue, 11 May 2010 20:23:22 -0400 Date: Wed, 12 May 2010 10:23:17 +1000 From: Stephen Rothwell To: Mauro Carvalho Chehab Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Brian Johnson , Yong Zhang Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree Message-Id: <20100512102317.b18808bf.sfr@canb.auug.org.au> In-Reply-To: <4BE9E6DC.1030800@infradead.org> References: <20100510103621.4ffbc8c3.sfr@canb.auug.org.au> <4BE9E6DC.1030800@infradead.org> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__12_May_2010_10_23_17_+1000_WI5naTdGZTT9oE5D" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Wed__12_May_2010_10_23_17_+1000_WI5naTdGZTT9oE5D Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Mauro, On Tue, 11 May 2010 20:23:08 -0300 Mauro Carvalho Chehab wrote: > > Conflicts solved. They were generated by an upstream merge from > my fixes tree. Thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__12_May_2010_10_23_17_+1000_WI5naTdGZTT9oE5D Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkvp9PUACgkQjjKRsyhoI8y/OQCgh6Auxc9cVFDO3SqwA0vbAttV rRwAn2jKyh1f3rJPPgIeiBz3PgYUgcH7 =5QO1 -----END PGP SIGNATURE----- --Signature=_Wed__12_May_2010_10_23_17_+1000_WI5naTdGZTT9oE5D--