Commits

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
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