tree c2bc72d67862df770af45a88814759baa0744d2c
parent 29dc5dd229dc3130b51df0932e59946fc09d3bd4
parent 4345adf92db760ca1a54061ce284aaa2e7d0791e
author Mark Brown <broonie@linaro.org> 1378894635 +0100
committer Mark Brown <broonie@linaro.org> 1378894635 +0100

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