Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756157AbZLCOSA (ORCPT ); Thu, 3 Dec 2009 09:18:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754612AbZLCOSA (ORCPT ); Thu, 3 Dec 2009 09:18:00 -0500 Received: from cantor2.suse.de ([195.135.220.15]:59803 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752957AbZLCOR7 (ORCPT ); Thu, 3 Dec 2009 09:17:59 -0500 Date: Thu, 3 Dec 2009 15:18:05 +0100 (CET) From: Jiri Kosina To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML Subject: Re: linux-next: Tree for December 3 In-Reply-To: <20091204011324.eb195558.sfr@canb.auug.org.au> Message-ID: References: <20091203180214.16e452ed.sfr@canb.auug.org.au> <20091204011324.eb195558.sfr@canb.auug.org.au> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 780 Lines: 22 On Fri, 4 Dec 2009, Stephen Rothwell wrote: > > > Merging trivial/for-next > > > CONFLICT (content): Merge conflict in Documentation/video4linux/gspca.txt > > > > have you been sending out e-mail about this conflict? I don't seem to have > > 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). Excellent, thanks. -- Jiri Kosina SUSE Labs, Novell Inc. -- 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/