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, 1 insertions, 1 deletions

diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 27dc463097f3..74f16f167b8e 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -645,7 +645,7 @@ static int validate_simple_test(char *put_str)
 
         while (*chk_str != '\0' && *put_str != '\0') {
                 /* If someone does a * to match the rest of the string, allow
-                 * it, or stop if the recieved string is complete.
+                 * it, or stop if the received string is complete.
                  */
                 if (*put_str == '#' || *chk_str == '*')
                         return 0;