tree 06e05c4c121abce92f5759eaa7d9baa87a25d496
parent bad318cd02e7cacb8e93608f050fa001830ad224
parent 5f9e6ff66f49d4d791af2b7c9d20727fb8a688e8
parent 1ca2e8474df3626f8d64d23420f8bd16bcef2448
author Mark Brown <broonie@linaro.org> 1395782535 +0000
committer Mark Brown <broonie@linaro.org> 1395782535 +0000

Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next