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/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 7fbc4adbb6d5..49d1cfc3217e 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1123,7 +1123,7 @@ list_modified:
         list_for_each_entry_safe(ipm, tmp, &card->ipm_list, list){
                 switch (ipm->ipm_state) {
                 case LCS_IPM_STATE_SET_REQUIRED:
-                        /* del from ipm_list so noone else can tamper with
+                        /* del from ipm_list so no one else can tamper with
                          * this entry */
                         list_del_init(&ipm->list);
                         spin_unlock_irqrestore(&card->ipm_lock, flags);