From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: MERGE check, net-next-2.6... Date: Mon, 30 Nov 2009 13:02:59 -0800 (PST) Message-ID: <20091130.130259.195994117.davem@davemloft.net> References: <20091129.011709.11078985.davem@davemloft.net> <8DD2590731AB5D4C9DBF71A877482A903E332F65@orsmsx509.amr.corp.intel.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, jeffrey.t.kirsher@intel.com, linville@tuxdriver.com, amit@netxen.com To: bruce.w.allan@intel.com Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:41046 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752230AbZK3VCx (ORCPT ); Mon, 30 Nov 2009 16:02:53 -0500 In-Reply-To: <8DD2590731AB5D4C9DBF71A877482A903E332F65@orsmsx509.amr.corp.intel.com> Sender: netdev-owner@vger.kernel.org List-ID: From: "Allan, Bruce W" Date: Mon, 30 Nov 2009 12:54:48 -0800 > Your merge conflict fix-ups for e1000e look good to me. Thanks! Thanks a lot for checking Allan.