tree 428cad1e37a4cd08d51b88cc973c396b05cc5764
parent 61e6cfa80de5760bbe406f4e815b7739205754d2
parent 5a6e19bedb13522924f5ee72c1f65b0fb5d33bc0
author Mark Brown <broonie@linaro.org> 1382102232 +0100
committer Mark Brown <broonie@linaro.org> 1382102232 +0100

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