tree 3b19eb54c684e36feab568078018dea31c43a79f
parent d60336e2f136287de821901d4a1b56179a0f7b69
parent 1d73ad298d1bfeee5d77c19e5cd667c551e30632
author Mark Brown <broonie@linaro.org> 1380817745 +0100
committer Mark Brown <broonie@linaro.org> 1380817745 +0100

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

Conflicts:
	sound/soc/fsl/fsl_ssi.c