From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <linux-wireless-owner@vger.kernel.org>
Received: from mx1.redhat.com ([66.187.233.31]:54281 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1422822AbXCWL7i (ORCPT <rfc822;linux-wireless@vger.kernel.org>);
	Fri, 23 Mar 2007 07:59:38 -0400
Subject: Re: Please pull 'upstream' branch of wireless-2.6
From: Dan Williams <dcbw@redhat.com>
To: Jeff Garzik <jeff@garzik.org>
Cc: "John W. Linville" <linville@tuxdriver.com>,
	linux-wireless@vger.kernel.org
In-Reply-To: <46036BCF.2020802@garzik.org>
References: <20070316213153.GD3426@tuxdriver.com>
	 <20070316213417.GE3426@tuxdriver.com>  <46036BCF.2020802@garzik.org>
Content-Type: text/plain
Date: Fri, 23 Mar 2007 08:02:29 -0400
Message-Id: <1174651349.27961.8.camel@localhost.localdomain>
Mime-Version: 1.0
Sender: linux-wireless-owner@vger.kernel.org
List-ID: <linux-wireless.vger.kernel.org>

On Fri, 2007-03-23 at 01:55 -0400, Jeff Garzik wrote:
> 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

Could you elaborate a bit?  We definitely need to get that fixed.

Dan