Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751942AbZGXAiy (ORCPT ); Thu, 23 Jul 2009 20:38:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751850AbZGXAiy (ORCPT ); Thu, 23 Jul 2009 20:38:54 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:58998 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbZGXAix (ORCPT ); Thu, 23 Jul 2009 20:38:53 -0400 Date: Fri, 24 Jul 2009 10:38:46 +1000 From: Stephen Rothwell To: Kevin Hilman Cc: Takashi Iwai , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chaithrika U S , Pavel Kiryukhin , Naresh Medisetty , Steve Chen , Mark Brown , Sudhakar Rajashekhara Subject: Re: linux-next: manual merge of the sound tree with the davinci tree Message-Id: <20090724103846.5988f4f7.sfr@canb.auug.org.au> In-Reply-To: <873a8ni8t7.fsf@deeprootsystems.com> References: <20090723112110.e42430e9.sfr@canb.auug.org.au> <873a8ni8t7.fsf@deeprootsystems.com> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__24_Jul_2009_10_38_46_+1000_Tu4=XU5tmPLl_/t1" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1162 Lines: 39 --Signature=_Fri__24_Jul_2009_10_38_46_+1000_Tu4=XU5tmPLl_/t1 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Kevin, On Thu, 23 Jul 2009 10:54:44 -0700 Kevin Hilman wrote: > > I've taken care of this in the DaVinci for-next branch. >=20 > I dropped the davinci changes that change code that were then dropped > by the asoc changes. Thanks. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__24_Jul_2009_10_38_46_+1000_Tu4=XU5tmPLl_/t1 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkppApYACgkQjjKRsyhoI8xhtgCeLYlss19CNZKb23422ELjBl7k qzcAn3NkkOKSQZHIuil1eEuEZVGiahmC =JSHU -----END PGP SIGNATURE----- --Signature=_Fri__24_Jul_2009_10_38_46_+1000_Tu4=XU5tmPLl_/t1-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/