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/include/linux/cdk.h b/include/linux/cdk.h
index 0908daf7bf56..80093a8d4f64 100644
--- a/include/linux/cdk.h
+++ b/include/linux/cdk.h
@@ -149,7 +149,7 @@ typedef struct cdkhdr {
 /*
  *      Define the memory mapping structure. This structure is pointed to by
  *      the memp field in the stlcdkhdr struct. As many as these structures
- *      as required are layed out in shared memory to define how the rest of
+ *      as required are laid out in shared memory to define how the rest of
  *      shared memory is divided up. There will be one for each port.
  */
 typedef struct cdkmem {