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

diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index 112d35b1bf0e..88d02d0a42c4 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -1680,7 +1680,7 @@ void plc_irq(struct s_smc *smc, int np, unsigned int cmd)
                          * Prevent counter from being wrapped after
                          * hanging years in that interrupt.
                          */
-                        plc->ebuf_cont++ ;      /* Ebuf continous error */
+                        plc->ebuf_cont++ ;      /* Ebuf continuous error */
                 }
 
 #ifdef  SUPERNET_3
@@ -1717,8 +1717,8 @@ void plc_irq(struct s_smc *smc, int np, unsigned int cmd)
                 }
 #endif  /* SUPERNET_3 */
         } else {
-                /* Reset the continous error variable */
-                plc->ebuf_cont = 0 ;    /* reset Ebuf continous error */
+                /* Reset the continuous error variable */
+                plc->ebuf_cont = 0 ;    /* reset Ebuf continuous error */
         }
         if (cmd & PL_PHYINV) {          /* physical layer invalid signal */
                 plc->phyinv++ ;