From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the net tree with the
 wireless-current tree
Date: Wed, 29 Apr 2009 20:23:26 -0700 (PDT)
Message-ID: <20090429.202326.47061587.davem@davemloft.net>
References: <20090430113328.791e835e.sfr@canb.auug.org.au>
	<20090430021635.GA17674@tuxdriver.com>
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]:36701
	"EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751704AbZD3DXc (ORCPT
	<rfc822;linux-next@vger.kernel.org>);
	Wed, 29 Apr 2009 23:23:32 -0400
In-Reply-To: <20090430021635.GA17674@tuxdriver.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: linville@tuxdriver.com
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org, johannes@sipsolutions.net, alan-jenkins@tuffmail.co.uk

From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 29 Apr 2009 22:16:35 -0400

> Yes, this looks correct -- please resolve the equivalent net-2.6 ->
> net-next-2.6 conflict this way too, Dave.

Will do, thanks.