ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Mon, 18 Apr 2011 17:07:43 +0000 (18:07 +0100)]
Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
sound/soc/codecs/wm8994.c

1  2 
drivers/staging/intel_sst/intel_sst_drv_interface.c
drivers/staging/intel_sst/intelmid.c
sound/soc/codecs/sn95031.c
sound/soc/imx/imx-ssi.c
sound/soc/mid-x86/sst_platform.c
sound/soc/soc-jack.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge