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_ssc_dai.c
atmel_ssc_dai.h
atmel-pcm.c
atmel-pcm.h
Kconfig
Makefile
playpaq_wm8510.c
sam9g20_wm8731.c
snd-soc-afeb9260.c