From mboxrd@z Thu Jan 1 00:00:00 1970 From: apatard@mandriva.com Subject: [patch 0/4] Re: [patch 1/6] orion/kirkwood: add audio functions. Date: Mon, 31 May 2010 13:49:11 +0200 Message-ID: <20100531114911.487732770@mandriva.com> References: <20100527125737.524554667@mandriva.com> <20100527130337.925751129@mandriva.com> <20100531111422.GF3489@rakim.wolfsonmicro.main> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from jules.rtp-net.org (sat78-1-82-232-42-61.fbx.proxad.net [82.232.42.61]) by alsa0.perex.cz (Postfix) with ESMTP id EE92C24156 for ; Mon, 31 May 2010 13:50:19 +0200 (CEST) In-Reply-To: <20100531111422.GF3489@rakim.wolfsonmicro.main> 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: alsa-devel@alsa-project.org Cc: nico@fluxnic.net, broonie@opensource.wolfsonmicro.com, saeed@marvell.com, tbm@cyrius.com, linux-arm-kernel@lists.infradead.org, lrg@slimlogic.co.uk List-Id: alsa-devel@alsa-project.org > I'm not sure which tree this patch was generated against but it won't > apply to either 2.6.35-rc1 or my old for-2.6.35 branch. Please > regenerate against my for-2.6.36 branch. The patches look fine but I'm > not able to apply them. oh, ok. Sorry. It was based on a previous for-2.6.36 branch and the newer one conflicts due to the mtd RnB patch. This new serie is based on your for-2.6.36 branch with HEAD 72ed5a8c9b057aeb779d161ac6fab1e98f091697 Arnaud From mboxrd@z Thu Jan 1 00:00:00 1970 From: apatard@mandriva.com (apatard at mandriva.com) Date: Mon, 31 May 2010 13:49:11 +0200 Subject: [patch 0/4] Re: [patch 1/6] orion/kirkwood: add audio functions. In-Reply-To: <20100531111422.GF3489@rakim.wolfsonmicro.main> References: <20100527125737.524554667@mandriva.com> <20100527130337.925751129@mandriva.com> <20100531111422.GF3489@rakim.wolfsonmicro.main> Message-ID: <20100531114911.487732770@mandriva.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org > I'm not sure which tree this patch was generated against but it won't > apply to either 2.6.35-rc1 or my old for-2.6.35 branch. Please > regenerate against my for-2.6.36 branch. The patches look fine but I'm > not able to apply them. oh, ok. Sorry. It was based on a previous for-2.6.36 branch and the newer one conflicts due to the mtd RnB patch. This new serie is based on your for-2.6.36 branch with HEAD 72ed5a8c9b057aeb779d161ac6fab1e98f091697 Arnaud