Merge branch 'for-3.2' into for-3.3

Conflicts:
	sound/soc/mxs/mxs-pcm.c

sound/soc/mxs/mxs-pcm.c

@@ -347,3 +347,6 @@ static struct platform_driver mxs_pcm_driver = {
 };
 
 module_platform_driver(mxs_pcm_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxs-pcm-audio");

sound/soc/mxs/mxs-sgtl5000.c

@@ -161,3 +161,4 @@ module_platform_driver(mxs_sgtl5000_audio_driver);
 MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 MODULE_DESCRIPTION("MXS ALSA SoC Machine driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxs-sgtl5000");