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

diff --cc drivers/staging/intel_sst/intel_sst_drv_interface.c
Simple merge

diff --cc drivers/staging/intel_sst/intelmid.c
Simple merge

diff --cc sound/soc/codecs/sn95031.c
Simple merge

diff --cc sound/soc/imx/imx-ssi.c
Simple merge

diff --cc sound/soc/mid-x86/sst_platform.c
Simple merge

diff --cc sound/soc/soc-jack.c
Simple merge