tree e76a7bf1a6ca3cc1a58ab52235f122a31246cc71
parent ff868b229657d5a2e449df7b1e2cc465ec86991d
parent 62477adf5f4ede918a97e648a5173b00bbbb17cc
author Mark Brown <broonie@linaro.org> 1371486023 +0100
committer Mark Brown <broonie@linaro.org> 1371486023 +0100

Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next