From mboxrd@z Thu Jan  1 00:00:00 1970
From: "John W. Linville" <linville@tuxdriver.com>
Subject: Re: [patch 2.6.14-rc4] e1000: Driver version, white space, comments, device id & other
Date: Wed, 19 Oct 2005 10:31:57 -0400
Message-ID: <20051019143154.GA16830@tuxdriver.com>
References: <10182005213103.13099@bilbo.tuxdriver.com> <4355AE62.7080605@pobox.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
	john.ronciak@intel.com, ganesh.venkatesan@intel.com,
	mallikarjuna.chilakala@intel.com
Return-path: <linux-kernel-owner+glk-linux-kernel-3=40m.gmane.org-S1751009AbVJSOcL@vger.kernel.org>
To: Jeff Garzik <jgarzik@pobox.com>
Content-Disposition: inline
In-Reply-To: <4355AE62.7080605@pobox.com>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org

On Tue, Oct 18, 2005 at 10:24:34PM -0400, Jeff Garzik wrote:
> John W. Linville wrote:
> >From: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
> >
> >Driver version, white space, comments, device id & other

> patch is ok, but doesn't apply to 'upstream' branch of netdev-2.6.git, 
> which has several e1000 patches in it.

I see...looks like some fuzz...I'll rediff and repost...

John
-- 
John W. Linville
linville@tuxdriver.com