tree 22951a04b81f5f6c7d8b31fbcdc44e8346501f30
parent 1b36881105249c8a3a0e56434e43d3e2fbbef704
parent b3ff04668c5a36c290e5b2849b6c86ceb3aec2c3
author Mark Brown <broonie@linaro.org> 1372959002 +0100
committer Mark Brown <broonie@linaro.org> 1372959002 +0100

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