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/mm/sparse.c b/mm/sparse.c
index 93250207c5cf..aa64b12831a2 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -500,7 +500,7 @@ void __init sparse_init(void)
          * so alloc 2M (with 2M align) and 24 bytes in turn will
          * make next 2M slip to one more 2M later.
          * then in big system, the memory will have a lot of holes...
-         * here try to allocate 2M pages continously.
+         * here try to allocate 2M pages continuously.
          *
          * powerpc need to call sparse_init_one_section right after each
          * sparse_early_mem_map_alloc, so allocate usemap_map at first.