From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kok, Auke" Subject: [PATCH 0/2] e1000: fix two mispatches Date: Tue, 18 Apr 2006 12:39:50 -0700 Message-ID: <20060418193950.16262.10757.stgit@gitlost.site> Cc: "Ronciak, John" , "Brandeburg, Jesse" , "Kirsher, Jeff" , "Kok, Auke" , akpm@osdl.org Return-path: Received: from [63.64.152.142] ([63.64.152.142]:517 "EHLO gitlost.site") by vger.kernel.org with ESMTP id S932297AbWDRTgt (ORCPT ); Tue, 18 Apr 2006 15:36:49 -0400 To: "Garzik, Jeff" , netdev@vger.kernel.org, "Miller, David" Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Hi, This patch series implements two e100 fixes for an old and new patch mishap. [1] fix mispatch for media type detect. [2] fix mismerge skb_put. These changes are available through git. git://63.64.152.142/~ahkok/git/netdev-2.6 e1000-7.0.38-k2-fixes these patches are against netdev-2.6#upstream 8fc65162a8f25929be80c8d6321a3479e92b5aae Cheers, Auke --- drivers/net/e1000/e1000_main.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) -- Auke Kok Intel Pro Ethernet Driver Group LAN Access Division / Digital Enterprise Group