From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH] isdn: Remove left over conflict marker in
 Docmentation/isdn/00-INDEX
Date: Fri, 19 Jun 2009 15:59:20 -0700 (PDT)
Message-ID: <20090619.155920.60079528.davem@davemloft.net>
References: <m18wjobjs0.fsf@fess.ebiederm.org>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org
To: ebiederm@xmission.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:58917
	"EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1753111AbZFSW7R (ORCPT
	<rfc822;netdev@vger.kernel.org>); Fri, 19 Jun 2009 18:59:17 -0400
In-Reply-To: <m18wjobjs0.fsf@fess.ebiederm.org>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: ebiederm@xmission.com (Eric W. Biederman)
Date: Fri, 19 Jun 2009 03:27:43 -0700

> Delete it and leave 00-INDEX looking reasonable.
> 
> Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>

Thanks Eric, but Tilman Schmidt is going to send me a patch
to fix this properly.