From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH] iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage
Date: Wed, 11 Nov 2009 13:04:58 -0800 (PST)
Message-ID: <20091111.130458.189631442.davem@davemloft.net>
References: <1257972506-14524-1-git-send-email-linville@tuxdriver.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org
To: linville@tuxdriver.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:57298
	"EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1757315AbZKKVEc (ORCPT
	<rfc822;netdev@vger.kernel.org>); Wed, 11 Nov 2009 16:04:32 -0500
In-Reply-To: <1257972506-14524-1-git-send-email-linville@tuxdriver.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 11 Nov 2009 15:48:26 -0500

> I may have botched my merge conflict resolution instructions for Dave...
> 
> Signed-off-by: John W. Linville <linville@tuxdriver.com>

Applied, thanks John.