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
..
atmel-pcm.c	ASoC: multi-component - ASoC Multi-Component Support	2010-08-12 14:00:00 +01:00
atmel-pcm.h	ASoC: multi-component - ASoC Multi-Component Support	2010-08-12 14:00:00 +01:00
atmel_ssc_dai.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
atmel_ssc_dai.h	ASoC: Add simplfied device registration for Atmel SSC devices	2010-08-18 16:53:22 +01:00
Kconfig	Fix Atmel soc audio boards Kconfig dependency	2010-11-11 14:50:13 +00:00
Makefile
playpaq_wm8510.c	ASoC: Do not include soc-dapm.h	2010-11-22 14:04:41 +00:00
sam9g20_wm8731.c	ASoC: Remove -codec from WM8731 driver name	2011-03-30 07:15:33 +09:00
snd-soc-afeb9260.c	ASoC: Fix codec device id format used by some dai_links	2011-01-25 15:12:36 +00:00