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
..
Kconfig	…
Makefile	…
mfld_machine.c	…
sst_platform.c	ASoC: Merge branch 'for-2.6.39' into for-2.6.40	2011-04-18 18:07:43 +01:00
sst_platform.h	…