]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge tag 'asoc-v4.1' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:11:13 +0000 (21:11 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:11:13 +0000 (21:11 +0100)
commitace8ab122e19301d6fec2e9150e14f833768ba0e
treec429d4c478dbd1830fb384ea9de336df4451df88
parent7282bf7aadbe0ccbb8792c44a64c95a1f24b687b
parentd7e3281b52fea8917fb4a7a5b09df5e6a9d2850c
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: 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>"
sound/soc/codecs/pcm512x.c
sound/soc/codecs/rt286.c
sound/soc/codecs/sn95031.c
sound/soc/soc-core.c