Return-path: Received: from ra.tuxdriver.com ([70.61.120.52]:4920 "EHLO ra.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934428AbXEGRCg (ORCPT ); Mon, 7 May 2007 13:02:36 -0400 Date: Mon, 7 May 2007 12:44:39 -0400 From: "John W. Linville" To: Jeff Garzik Cc: Dan Williams , Christoph Hellwig , linux-wireless@vger.kernel.org, marcelo@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Linus Torvalds Subject: Re: Please pull 'revert-libertas' branch of wireless-2.6 (was Re: Please pull 'libertas' branch of wireless-2.6) Message-ID: <20070507164439.GE5125@tuxdriver.com> References: <20070227205649.GH5826@tuxdriver.com> <45E8CF5E.5090305@garzik.org> <20070303052140.GA31075@infradead.org> <20070507104117.GA31601@infradead.org> <1178539423.3032.24.camel@localhost.localdomain> <20070507141143.GB5125@tuxdriver.com> <463F443A.5000306@garzik.org> <1178552878.5760.4.camel@localhost.localdomain> <463F4A5E.6000501@garzik.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <463F4A5E.6000501@garzik.org> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Mon, May 07, 2007 at 11:48:46AM -0400, Jeff Garzik wrote: > Dan Williams wrote: > >So, either we push it off until 2.6.23, or it gets merged as-is and we > >clean it up as we go along, which we'll certainly do. > > Um, it was merged a while ago. > > That's why John's email, and my own, are discussing the revert of the > driver, not the merge of the driver. > > The executive decision has been made. Yep, let's keep it -- and keep Dan and Marcelo on the hook... :-) John -- John W. Linville linville@tuxdriver.com