summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:49:20 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:49:20 +0100
commitff096eae2ef7d5f1c62a340a4b670912c2df5b98 (patch)
tree2dcf70e9536ca73c564c92a35e122e29e15bf5c6 /sound
parente3438187d2a3b149f5c246ed740df3cf9d4df3d6 (diff)
parent1b13fe718b6ebca2b12cfa3d6cd32b8b68a03e38 (diff)
parentf580f8afd0d81c3f04d8b393c9d675ef289e4d40 (diff)
parent5cf57f0f6b25d046e6ea219d99681077edca5d7c (diff)
downloadlinux-ff096eae2ef7d5f1c62a340a4b670912c2df5b98.tar.gz
linux-ff096eae2ef7d5f1c62a340a4b670912c2df5b98.tar.bz2
linux-ff096eae2ef7d5f1c62a340a4b670912c2df5b98.zip
Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23' and 'asoc/topic/ux500' into asoc-next