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

Merge branch 'for-2.6.38' into for-2.6.39

2011-02-26 09:50:01 +00:00

imx-pcm-dma-mx2.c

ASoC: imx: fix burstsize for DMA

2011-03-26 17:24:55 +00:00

imx-pcm-fiq.c

ASoC: multi-component - ASoC Multi-Component Support

2010-08-12 14:00:00 +01:00

imx-ssi.c

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

2011-04-18 18:07:43 +01:00

imx-ssi.h

ASoC: imx: set watermarks for mx2-dma

2011-03-26 17:24:55 +00:00

Kconfig

ASoC: Add machine driver for Visstrim_M10 board.

2011-03-07 11:48:18 +00:00

Makefile

ASoC: Add machine driver for Visstrim_M10 board.

2011-03-07 11:48:18 +00:00

mx27vis-aic32x4.c

ASoC: Add machine driver for Visstrim_M10 board.

2011-03-07 11:48:18 +00:00

phycore-ac97.c

Merge branch 'for-2.6.37' into for-2.6.38

2010-11-25 11:17:24 +00:00

wm1133-ev1.c

ASoC: Do not include soc-dapm.h

2010-11-22 14:04:41 +00:00