tree ccd4625f03507b02c8ac23bb173249eb4df5a6da
parent 971a6f45e071447975c33d6747f95a1e385d0f45
parent fc7dc61d9a87011aaf8a6eb3144ebf9552adf5d2
author Mark Brown <broonie@linaro.org> 1384960831 +0000
committer Mark Brown <broonie@linaro.org> 1384960831 +0000

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