Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757149AbZFSDg5 (ORCPT ); Thu, 18 Jun 2009 23:36:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753774AbZFSDgr (ORCPT ); Thu, 18 Jun 2009 23:36:47 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:49186 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753490AbZFSDgq (ORCPT ); Thu, 18 Jun 2009 23:36:46 -0400 Date: Thu, 18 Jun 2009 20:36:50 -0700 (PDT) Message-Id: <20090618.203650.151313398.davem@davemloft.net> To: t.schmidt@phoenixsoftware.de Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT]: Networking From: David Miller In-Reply-To: <4A3ACB47.3050502@phoenixsoftware.de> References: <20090615.050449.144947903.davem@davemloft.net> <4A3ACB47.3050502@phoenixsoftware.de> X-Mailer: Mew version 6.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 757 Lines: 20 From: Tilman Schmidt Date: Fri, 19 Jun 2009 01:18:31 +0200 > Am 15.06.2009 14:04 schrieb David Miller: >> Documentation/isdn/00-INDEX | 29 +- > > It seems something went wrong with the merge. After: ... > Also, some of the entries, such as README.audio and README.icn, are now duplicated. > Can that be repaired, or would you like me to prepare a patch cleaning it up? Sorry I messed that up, could you please send me a patch to fix it up? Thank you! -- 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/