diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-12 18:49:20 (GMT) |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-12 18:49:20 (GMT) |
commit | ff096eae2ef7d5f1c62a340a4b670912c2df5b98 (patch) | |
tree | 2dcf70e9536ca73c564c92a35e122e29e15bf5c6 /sound | |
parent | e3438187d2a3b149f5c246ed740df3cf9d4df3d6 (diff) | |
parent | 1b13fe718b6ebca2b12cfa3d6cd32b8b68a03e38 (diff) | |
parent | f580f8afd0d81c3f04d8b393c9d675ef289e4d40 (diff) | |
parent | 5cf57f0f6b25d046e6ea219d99681077edca5d7c (diff) | |
download | linux-ff096eae2ef7d5f1c62a340a4b670912c2df5b98.tar.xz |
Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23' and 'asoc/topic/ux500' into asoc-next