From: Mark Brown <broonie@kernel.org>
Date: Sun, 12 Apr 2015 18:48:29 +0000 (+0100)
Subject: Merge tag 'asoc-v4.1' into asoc-next
X-Git-Tag: v4.1-rc1~16^2~14^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89a88dd3d6823f46bfb1405c4b358f89d5526cd6;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'asoc-v4.1' into asoc-next

ASoC: Changes for v4.1

A selection of changes for v4.1 so far.  The main things are:

 - Move of jack registration to the card where it belongs.
 - Support for DAPM routes specified by both the machine driver and DT.

# gpg: Signature made Thu 05 Mar 2015 01:10:27 GMT using RSA key ID 5D5487D0
# gpg: WARNING: digest algorithm MD5 is deprecated
# gpg: please see https://gnupg.org/faq/weak-digest-algos.html for more information
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
---

89a88dd3d6823f46bfb1405c4b358f89d5526cd6