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	ASoC: mid-x86: Fix dependency on intel_sst driver	2011-02-07 11:23:45 +00:00
Makefile	ASoC: mid-x86 - remove the flag in makefile	2011-01-10 11:36:02 +00:00
mfld_machine.c	ASoC: mfld_machine: make use of soc_register_card API	2011-02-15 17:59:05 -08:00
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