Merge branch 'for-3.2' into for-3.3

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

diff --cc sound/soc/mxs/mxs-pcm.c
index 612ad3d9052d7b555236188482cea3d0646336f5,f39d7dd9fbcb5956cf55f989ae0a869bfe7bd336..0e12f4e0a76d60ac10dab9b70ad4e12f80e0d0c7
--- 1/sound/soc/mxs/mxs-pcm.c
--- 2/sound/soc/mxs/mxs-pcm.c
+++ b/sound/soc/mxs/mxs-pcm.c
@@@ -346,4 -346,17 +346,7 @@@ static struct platform_driver mxs_pcm_d
        .remove = __devexit_p(mxs_soc_platform_remove),
  };
  
 -static int __init snd_mxs_pcm_init(void)
 -{
 -      return platform_driver_register(&mxs_pcm_driver);
 -}
 -module_init(snd_mxs_pcm_init);
 -
 -static void __exit snd_mxs_pcm_exit(void)
 -{
 -      platform_driver_unregister(&mxs_pcm_driver);
 -}
 -module_exit(snd_mxs_pcm_exit);
 +module_platform_driver(mxs_pcm_driver);
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("platform:mxs-pcm-audio");

diff --cc sound/soc/mxs/mxs-sgtl5000.c
Simple merge