From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1755601AbYIKXKR@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755601AbYIKXKR (ORCPT <rfc822;w@1wt.eu>);
	Thu, 11 Sep 2008 19:10:17 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753122AbYIKXKB
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 11 Sep 2008 19:10:01 -0400
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:36589
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1752312AbYIKXKA (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 11 Sep 2008 19:10:00 -0400
Date: Thu, 11 Sep 2008 16:09:52 -0700 (PDT)
Message-Id: <20080911.160952.107319416.davem@davemloft.net>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
       linux-kernel@vger.kernel.org, sfr@canb.auug.org.au
Subject: Re: pull request: wireless-2.6 2008-09-11
From: David Miller <davem@davemloft.net>
In-Reply-To: <20080911203552.GL3423@tuxdriver.com>
References: <20080911201308.GJ3423@tuxdriver.com>
	<20080911203552.GL3423@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, 11 Sep 2008 16:35:53 -0400

> BTW, this (obviously) introduces a merge conflict between
> wireless-2.6 and wireless-next-2.6.  The solution is trivial -- just
> take the wireless-next-2.6 version of the affected files.  Still, I
> have a sample merge available here:
>
> 	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git merge-test

Ok, I just did the merge, please double check my work.

Thanks!