From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liam Girdwood Subject: Re: [GIT PULL] ASoC updates for 2.6.36 Date: Mon, 02 Aug 2010 11:45:49 +0100 Message-ID: <1280745949.3095.47.camel@odin> References: <1280742830.3095.33.camel@odin> <1280745056.3095.46.camel@odin> (sfid-20100802_113104_404663_A6E58875) <24C97B09-0B9B-4115-82DF-0528B6B55EE6@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wy0-f179.google.com (mail-wy0-f179.google.com [74.125.82.179]) by alsa0.perex.cz (Postfix) with ESMTP id 97216103816 for ; Mon, 2 Aug 2010 12:45:52 +0200 (CEST) Received: by wyb42 with SMTP id 42so2988942wyb.38 for ; Mon, 02 Aug 2010 03:45:52 -0700 (PDT) In-Reply-To: <24C97B09-0B9B-4115-82DF-0528B6B55EE6@opensource.wolfsonmicro.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: Takashi Iwai , alsa-devel List-Id: alsa-devel@alsa-project.org On Mon, 2010-08-02 at 11:33 +0100, Mark Brown wrote: > On 2 Aug 2010, at 11:30, Liam Girdwood wrote: > > > Ok, the multi-component branch does touch arch quite a bit as we are > > adding platform devices for all our components. So it's probably safer > > for merging (after your pull request) in the for 2.6.37 period to reduce > > any merge conflict with arch. > > > Fwiw, the release yesterday did take me a little by surprise as I was at > > least expecting an rc7 and a little extra time for multi-comp ;) > > In that case I guess I'll send a pull request with WM8741 tomorrow and > send you the multi-component updates for it separately if that's OK > with you (I'm about to crash, just got in from 16 hours of flying)? Yep, that's cool. Thanks Liam -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk