Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756147AbZLCON0 (ORCPT ); Thu, 3 Dec 2009 09:13:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752477AbZLCONZ (ORCPT ); Thu, 3 Dec 2009 09:13:25 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:53578 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752134AbZLCONY (ORCPT ); Thu, 3 Dec 2009 09:13:24 -0500 Date: Fri, 4 Dec 2009 01:13:24 +1100 From: Stephen Rothwell To: Jiri Kosina Cc: linux-next@vger.kernel.org, LKML Subject: Re: linux-next: Tree for December 3 Message-Id: <20091204011324.eb195558.sfr@canb.auug.org.au> In-Reply-To: References: <20091203180214.16e452ed.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__4_Dec_2009_01_13_24_+1100_El6RafRcpdjh.j8a" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1401 Lines: 42 --Signature=_Fri__4_Dec_2009_01_13_24_+1100_El6RafRcpdjh.j8a Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jiri, On Thu, 3 Dec 2009 14:37:06 +0100 (CET) Jiri Kosina wrote: > > > Merging trivial/for-next > > CONFLICT (content): Merge conflict in Documentation/video4linux/gspca.t= xt >=20 > have you been sending out e-mail about this conflict? I don't seem to hav= e=20 > received any. No, I didn't because it is very simple and was only in a documentation file. I figured it would be cleared up easily if/when it comes up in being merged into Linus' tree (or maybe before if it is noticed). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__4_Dec_2009_01_13_24_+1100_El6RafRcpdjh.j8a Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAksXx4QACgkQjjKRsyhoI8yHNACfXgksVUovZXEsKzhQPnwGbMiC WwYAoKbGxPHgJNLIsKK8nOFoAI8uDpb/ =d5Q1 -----END PGP SIGNATURE----- --Signature=_Fri__4_Dec_2009_01_13_24_+1100_El6RafRcpdjh.j8a-- -- 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/