Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
authorMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 11:05:47 +0000 (12:05 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 26 Sep 2013 11:05:47 +0000 (12:05 +0100)
commite8f00c1b01c8b547bd1e11754634ce1913c7cc72
treef50e57dc2ce4ca1a3f84b6c036c989b5491dc8c5
parent9ff50721e47ab0abb8b93159170f67262886ef0d
parent50d4a790e65f5ac91a7b2720a19e80e862b40318
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm

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