Mark Brown d5381e42f6 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		2011-04-18 18:07:43 +01:00
..
eukrea-tlv320.c
imx-pcm-dma-mx2.c
imx-pcm-fiq.c
imx-ssi.c
imx-ssi.h
Kconfig
Makefile
mx27vis-aic32x4.c
phycore-ac97.c
wm1133-ev1.c