From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: Please pull 'upstream' branch of wireless-2.6 Date: Thu, 07 Dec 2006 05:03:06 -0500 Message-ID: <4577E6DA.3080101@garzik.org> References: <20061206014227.GA9830@tuxdriver.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:36170 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031932AbWLGKDK (ORCPT ); Thu, 7 Dec 2006 05:03:10 -0500 To: "John W. Linville" In-Reply-To: <20061206014227.GA9830@tuxdriver.com> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org John W. Linville wrote: > The following changes since commit e62438630ca37539c8cc1553710bbfaa3cf960a7: > Matthew Wilcox: > Centralise definitions of sector_t and blkcnt_t > > are found in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream pulled, but there were workqueue-related conflicts. let me know if #upstream doesn't match what you would like.