Takashi Iwai d71f4cece4 Merge branch 'topic/asoc' into for-linus ... Conflicts: sound/soc/codecs/ad1938.c		2010-05-20 12:00:43 +02:00
..
imx-pcm-dma-mx2.c	Merge branch 'fix/asoc' into for-linus	2010-04-16 10:03:36 +02:00
imx-pcm-fiq.c	Merge branch 'fix/asoc' into for-linus	2010-04-16 10:03:36 +02:00
imx-ssi.c	Merge branch 'fix/asoc' into for-linus	2010-04-16 10:03:36 +02:00
imx-ssi.h
Kconfig	Merge branch 'for-2.6.34' into for-2.6.35	2010-03-22 17:23:46 +00:00
Makefile
phycore-ac97.c
wm1133-ev1.c	ASoC: Move WM8350 microphone detection bias managment out of driver	2010-03-22 17:21:38 +00:00