From: Mark Brown Subject: Re: [GIT PULL] ASoC updates for v4.5 Date: Mon, 11 Jan 2016 15:30:50 +0000 Message-ID: <20160111153050.GH6588@sirena.org.uk> References: <20160111152020.GG6588@sirena.org.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4867762554458291939==" Return-path: Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 0DDD7260526 for ; Mon, 11 Jan 2016 16:30:56 +0100 (CET) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Takashi Iwai Cc: alsa-devel@alsa-project.org, Liam Girdwood List-Id: alsa-devel@alsa-project.org --===============4867762554458291939== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mlnxvmnLyWgus2CN" Content-Disposition: inline --mlnxvmnLyWgus2CN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Jan 11, 2016 at 04:29:35PM +0100, Takashi Iwai wrote: > BTW, your tree still contains dapm_path_list in > sound/soc/intel/skylake/skl.h. I suppose this is a leftover of a > merge conflict? Yes. --mlnxvmnLyWgus2CN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWk8qqAAoJECTWi3JdVIfQnGgH+wTd89NxyzfNqvwOfKy+adzl ib3Xu7eSpgvu3pB7SzEFwU6xT4B4aXCWzgwJ+zdcbESyBJKaQDqWs1UvLepqaDQA RWFB8xNYkj829ijfdLOSxs4wc0jPQeJLd/SL4CApVmais+2+gwiR4UeP8ALGBGQo 3QWqgXcmAKzFG+0YsAawao+OMASZRcYYpadgIVEcLYd7O/WzTp8tigm4SG+fYmDM TdYNvCJbvvL3WBh7v//PKZ1VBlPWeblfjKWFpbBZv1VkwBi/i9Wc/Axdd4OuOv3Y LMHxWmlLHPvhE7Jj53eCQR00yqA4/A/n03Hqux5q9hy/9x3hOBY2QtsIoLxD1OE= =NUjA -----END PGP SIGNATURE----- --mlnxvmnLyWgus2CN-- --===============4867762554458291939== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline --===============4867762554458291939==--