Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754721AbZICGtJ (ORCPT ); Thu, 3 Sep 2009 02:49:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754552AbZICGtI (ORCPT ); Thu, 3 Sep 2009 02:49:08 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:60646 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754494AbZICGtH (ORCPT ); Thu, 3 Sep 2009 02:49:07 -0400 Date: Thu, 3 Sep 2009 16:49:03 +1000 From: Stephen Rothwell To: Mauro Carvalho Chehab Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Randy Dunlap Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree Message-Id: <20090903164903.0d9043d1.sfr@canb.auug.org.au> In-Reply-To: <20090902231214.495d4002@pedra.chehab.org> References: <20090902121713.f709b1ce.sfr@canb.auug.org.au> <20090902231214.495d4002@pedra.chehab.org> X-Mailer: Sylpheed 2.7.1 (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=_Thu__3_Sep_2009_16_49_03_+1000_jmMt_HgLAik+Q60a" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1133 Lines: 38 --Signature=_Thu__3_Sep_2009_16_49_03_+1000_jmMt_HgLAik+Q60a Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Mauro, On Wed, 2 Sep 2009 23:12:14 -0300 Mauro Carvalho Chehab wrote: > > I've rebased it to fix this merge conflict between my devel tree and upst= ream. > You probably can drop it on your next merge. Thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__3_Sep_2009_16_49_03_+1000_jmMt_HgLAik+Q60a Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkqfZt8ACgkQjjKRsyhoI8y03wCgiqD84AsM5HgzZkhiNUqGSFXA UQ0AoLmY8tCIE/eY7nzRv1bP/FBJiYdc =xQgk -----END PGP SIGNATURE----- --Signature=_Thu__3_Sep_2009_16_49_03_+1000_jmMt_HgLAik+Q60a-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/