From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Re: linux-next: manual merge of the sound-asoc tree Date: Fri, 3 Feb 2012 10:51:24 +0000 Message-ID: <20120203105123.GB3151@opensource.wolfsonmicro.com> References: <20120203125902.558e273c84b339957869f281@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ADZbWkCsHQ7r3kzd" Return-path: Content-Disposition: inline In-Reply-To: <20120203125902.558e273c84b339957869f281@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Liam Girdwood , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org --ADZbWkCsHQ7r3kzd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Feb 03, 2012 at 12:59:02PM +1100, Stephen Rothwell wrote: > I fixed it up (I think - see below) and can carry the fix as necessary. That's the correct fix, thanks. I'll resolve this in my tree once Linus' tree has merged the conflicting stuff. --ADZbWkCsHQ7r3kzd Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJPK7wfAAoJEBus8iNuMP3dIXIP/0liRWQui90L79w72G3igr9m MCH7HHsztVTNSMFFZYaak6Nn+AAtTxN0ZW9fM+3YP5Vgx6NhjFu9TTcN3DPcpqew SGN6Gw+iEtPzhrg/XAT/3ekLX1Gi/hrDQHIIxOmbdchMvMIFeVPSnAa09kaldV2t Up4KGsSynyAozvCftepRRDqAQI/NEgwnrM9iR/kjxGNMMF8J3JyDdRdrwuHBUOy/ /AshEZUCFCG0LeCXD+QVELHVOLvivy3V+xPaiLTNM/QvXoTyQoPMd4y58MuzhpxC 8c4khK5WGFItAIHKiBSZgGYrhxyscNLFc9aVzcz0U7ishQtO10dxU8I+WHz1KFTE j4RfgN7OZtFbYmVgF56nE6Cgm1iOYXJr4lW0BspUEl9EVfDDX+JgcOGl+1hNxG5+ bBO4ZMN6m0D9G+QWA1XziNJcYmJULz54q2ZqjypucKzLwYilQ/XLN2hcULAxMRRj E/qEhVBQhKYDXlhaGT66IL/61nwBEWmrf8uVRIJg6+2D81yqN6C3f0dhKi/ulH2h /HXuvPTH3LzB0R9KCmlF3YdTt60Mc1NIVFVQ+4vquv31QFqYDUk+eYqSmrrPkMhK NrahP6p0voEuvI/GHY8fOn014Dx0gpAMA9u86TYYFKmVCh/llO4MWK1W8mtH07vQ gjl2OEipXWDAk3dIF4wL =jICq -----END PGP SIGNATURE----- --ADZbWkCsHQ7r3kzd--