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/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 62843d39817c..280df43ca446 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -2577,7 +2577,7 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type)
                         break;
 
                 case 6: /* ts1 parallel mode */
-                        cx231xx_info("%s: set ts1 parrallel mode registers\n",
+                        cx231xx_info("%s: set ts1 parallel mode registers\n",
                                      __func__);
                         status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
                         status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);