linux-imx

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

Conflicts:
	sound/soc/fsl/imx-sgtl5000.c