Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758524AbZFRXsW (ORCPT ); Thu, 18 Jun 2009 19:48:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754640AbZFRXsQ (ORCPT ); Thu, 18 Jun 2009 19:48:16 -0400 Received: from mail.phnxsoft.com ([195.227.45.4]:2514 "EHLO posthamster.phnxsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752672AbZFRXsQ (ORCPT ); Thu, 18 Jun 2009 19:48:16 -0400 X-Greylist: delayed 1776 seconds by postgrey-1.27 at vger.kernel.org; Thu, 18 Jun 2009 19:48:15 EDT Message-ID: <4A3ACB47.3050502@phoenixsoftware.de> Date: Fri, 19 Jun 2009 01:18:31 +0200 From: Tilman Schmidt User-Agent: Thunderbird 2.0.0.19 (X11/20081227) MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT]: Networking References: <20090615.050449.144947903.davem@davemloft.net> In-Reply-To: <20090615.050449.144947903.davem@davemloft.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.33 () AWL,BAYES_50,RDNS_NONE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1362 Lines: 38 Am 15.06.2009 14:04 schrieb David Miller: > Documentation/isdn/00-INDEX | 29 +- It seems something went wrong with the merge. After: commit aba7453037c3a90714caae77a622dceaf1173786 Merge: a4fe91e 93af7ac Author: David S. Miller Date: Wed Apr 29 20:30:35 2009 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: Documentation/isdn/00-INDEX drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/rndis_wlan.c net/mac80211/main.c lines 22..28 of Documentation/isdn/00-INDEX now look like this: - info on the drivers for Siemens Gigaset ISDN adapters. README.icn - info on the ICN-ISDN-card and its driver. >>>>>>> 93af7aca44f0e82e67bda10a0fb73d383edcc8bd:Documentation/isdn/00-INDEX README.HiSax - info on the HiSax driver which replaces the old teles. README.audio 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? Thanks, Tilman -- 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/