ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index d827edb3d544..9765fb81a5e3 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -446,7 +446,7 @@ static int sst_platform_remove(struct platform_device *pdev)
 
         snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai));
         snd_soc_unregister_platform(&pdev->dev);
-        pr_debug("sst_platform_remove sucess\n");
+        pr_debug("sst_platform_remove success\n");
         return 0;
 }
 
@@ -469,7 +469,7 @@ module_init(sst_soc_platform_init);
 static void __exit sst_soc_platform_exit(void)
 {
         platform_driver_unregister(&sst_platform_driver);
-        pr_debug("sst_soc_platform_exit sucess\n");
+        pr_debug("sst_soc_platform_exit success\n");
 }
 module_exit(sst_soc_platform_exit);