diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-03 11:39:38 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-03 11:39:38 +0200 |
commit | bad6f621e492f65a0bf0fbe8db1c9c7f20da6a60 (patch) | |
tree | 93e1649e45919a7b39675a9feefd321685d8c903 /sound/soc/pxa/pxa-ssp.c | |
parent | Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm8731', 'asoc... (diff) | |
parent | ASoC: pxa: pxa-ssp: Terminate of match table (diff) | |
parent | ASoC: tlv320aci3x: Fix custom snd_soc_dapm_put_volsw_aic3x() function (diff) | |
download | linux-bad6f621e492f65a0bf0fbe8db1c9c7f20da6a60.tar.xz linux-bad6f621e492f65a0bf0fbe8db1c9c7f20da6a60.zip |
Merge remote-tracking branches 'asoc/fix/pxa' and 'asoc/fix/tlv320aic3x' into asoc-linus