From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:60539 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753206AbXCWFzb (ORCPT ); Fri, 23 Mar 2007 01:55:31 -0400 Message-ID: <46036BCF.2020802@garzik.org> Date: Fri, 23 Mar 2007 01:55:27 -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 References: <20070316213153.GD3426@tuxdriver.com> <20070316213417.GE3426@tuxdriver.com> In-Reply-To: <20070316213417.GE3426@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: > The following changes since commit 0e39a919461842a38e406702fe0e94c6138ddfef > John W. Linville (1): > Merge branch 'upstream-fixes' into upstream > > are found in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream pulled this and upstream-fixes. libertas had a merge conflict that I would prefer you sort out. You should merge libertas branch into upstream anyway Jeff