From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: linux-next: net/wireless/wireless-current tree build warning
Date: Mon, 07 Dec 2009 15:19:18 -0800 (PST)
Message-ID: <20091207.151918.41663287.davem@davemloft.net>
References: <20091208092057.dd2eeaeb.sfr@canb.auug.org.au>
	<20091207223236.GF18939@tuxdriver.com>
	<20091208095931.aaff7572.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:50192
	"EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S935672AbZLGXTM (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 7 Dec 2009 18:19:12 -0500
In-Reply-To: <20091208095931.aaff7572.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: sfr@canb.auug.org.au
Cc: linville@tuxdriver.com, johannes@sipsolutions.net, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Dec 2009 09:59:31 +1100

> Hi John,
> 
> On Mon, 7 Dec 2009 17:32:37 -0500 "John W. Linville" <linville@tuxdriver.com> wrote:
>>
>> I've just merged such a patch...thanks!
> 
> Ah, thanks.  I will still apply it as a merge fix for the net tree until
> Dave merges your tree again.

I haven't touched my tree in a few days since I'm still
waiting for Linus to pull my tree in.

Once that happens we'll sort out these merge issues.

Thanks!