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/fs/ntfs/logfile.h b/fs/ntfs/logfile.h
index b5a6f08bd35c..aa2b6ac3f0a4 100644
--- a/fs/ntfs/logfile.h
+++ b/fs/ntfs/logfile.h
@@ -222,7 +222,7 @@ typedef struct {
 /* 24*/ sle64 file_size;        /* Usable byte size of the log file.  If the
                                    restart_area_offset + the offset of the
                                    file_size are > 510 then corruption has
-                                   occured.  This is the very first check when
+                                   occurred.  This is the very first check when
                                    starting with the restart_area as if it
                                    fails it means that some of the above values
                                    will be corrupted by the multi sector