From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:40263 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422950AbXDXR5Z (ORCPT ); Tue, 24 Apr 2007 13:57:25 -0400 Message-ID: <462E4503.5020701@garzik.org> Date: Tue, 24 Apr 2007 13:57:23 -0400 From: Jeff Garzik MIME-Version: 1.0 To: "John W. Linville" CC: linux-wireless@vger.kernel.org Subject: Re: Please pull 'upstream' branch of wireless-2.6 (actually 'for-jgarzik') References: <20070410202337.GC14123@tuxdriver.com> <20070410202451.GD14123@tuxdriver.com> In-Reply-To: <20070410202451.GD14123@tuxdriver.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: John W. Linville wrote: > Jeff, > > I branched off netdev-2.6#upstream, pulled my upstream into it, and > resolved the conflicts. So, you probably want to pull from here > instead: > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git for-jgarzik > > FWIW, this also includes the patches from the pull request posted on > 27 March 2007: > > http://marc.info/?l=linux-wireless&m=117514552402407&w=2 pulled