Return-path: Received: from fg-out-1718.google.com ([72.14.220.154]:18307 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751017AbZFTE3l (ORCPT ); Sat, 20 Jun 2009 00:29:41 -0400 Received: by fg-out-1718.google.com with SMTP id 16so698838fgg.17 for ; Fri, 19 Jun 2009 21:29:43 -0700 (PDT) To: Bob Copeland Cc: Pierre Ossman , linux-wireless@vger.kernel.org, san@google.com Subject: Re: [PATCH/RFC 7/7] wl12xx: add sdio support References: <1244685780-28930-1-git-send-email-me@bobcopeland.com> <1244685780-28930-8-git-send-email-me@bobcopeland.com> <20090613132144.6c7783bc@mjolnir.ossman.eu> <87bposnmxi.fsf@litku.valot.fi> <20090613220908.271865cd@mjolnir.ossman.eu> <20090613205737.GA30439@hash.localnet> <20090618022524.GC10014@hash.localnet> <20090619212419.2f3626d7@mjolnir.ossman.eu> From: Kalle Valo Date: Sat, 20 Jun 2009 07:29:40 +0300 In-Reply-To: (Bob Copeland's message of "Fri\, 19 Jun 2009 16\:31\:41 -0400") Message-ID: <871vpfplxn.fsf@litku.valot.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-wireless-owner@vger.kernel.org List-ID: Bob Copeland writes: >> Do you want me to merge it? > > It can go via the wireless tree if that's ok with you, since the > SPI driver already lives there and this all needs to be rebased > on Kalle Valo's latest changes anyway. I agree, better to merge all wl12xx patches through John. Otherwise we start to get conflicts, and that's pain. -- Kalle Valo