tree 938aca555a69ef3b2099cd7ccc94dec2c1704a3c
parent a67061e2a90bd023e7ed6518fe3dfeb24fe295ea
parent 46a5905e1cd4a9d9d238ec7beece49ce49e2ad85
author Mark Brown <broonie@linaro.org> 1374603430 +0100
committer Mark Brown <broonie@linaro.org> 1374603430 +0100

Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus