Takashi Iwai d71f4cece4 Merge branch 'topic/asoc' into for-linus ... Conflicts: sound/soc/codecs/ad1938.c		2010-05-20 12:00:43 +02:00
..
Kconfig	…
Makefile	…
davinci-evm.c	…
davinci-i2s.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-04-07 08:42:25 -07:00
davinci-i2s.h	…
davinci-mcasp.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-04-07 08:42:25 -07:00
davinci-mcasp.h	…
davinci-pcm.c	ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream	2010-04-05 19:14:11 +01:00
davinci-pcm.h	…
davinci-sffsdr.c	…
davinci-vcif.c	ASoC: update gfp/slab.h includes	2010-03-29 21:28:43 +02:00
davinci-vcif.h	…