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/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 7c3921de9589..2771d818406e 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1254,7 +1254,7 @@ static int setup_overlay(struct zoran_fh *fh, int on)
 {
         struct zoran *zr = fh->zr;
 
-        /* If there is nothing to do, return immediatly */
+        /* If there is nothing to do, return immediately */
         if ((on && fh->overlay_active != ZORAN_FREE) ||
             (!on && fh->overlay_active == ZORAN_FREE))
                 return 0;