From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1754340AbZBEXLv@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754340AbZBEXLv (ORCPT <rfc822;w@1wt.eu>);
	Thu, 5 Feb 2009 18:11:51 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751761AbZBEXLj
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 5 Feb 2009 18:11:39 -0500
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:55724
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1751067AbZBEXLi (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 5 Feb 2009 18:11:38 -0500
Date: Thu, 05 Feb 2009 15:11:34 -0800 (PST)
Message-Id: <20090205.151134.161990223.davem@davemloft.net>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
       linux-kernel@vger.kernel.org
Subject: Re: pull request: wireless-2.6 2009-02-05
From: David Miller <davem@davemloft.net>
In-Reply-To: <20090205165837.GB4638@tuxdriver.com>
References: <20090205165837.GB4638@tuxdriver.com>
X-Mailer: Mew version 6.1 on Emacs 22.1 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 5 Feb 2009 11:58:38 -0500

> A couple of small fixes for iwlwifi intended for 2.6.29.  One of them
> will conflict when it is pulled into net-next-2.6 -- just take all the
> hunks.

Pulled, thanks a lot John.