Mark Brown 53a61d967a Merge branch 'for-2.6.34' into for-2.6.35 ...

Conflicts due to context changes next to the backported DMA data change:
	include/sound/soc.h

2010-04-05 19:19:32 +01:00

..

am3517evm.c

…

ams-delta.c

…

igep0020.c

…

Kconfig

…

Makefile

…

mcpdm.c

ASoC: McPDM: Use tabs for indentation

2010-03-19 11:14:39 +00:00

mcpdm.h

…

n810.c

…

omap2evm.c

…

omap3beagle.c

…

omap3evm.c

…

omap3pandora.c

…

omap-mcbsp.c

ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream

2010-04-05 19:14:11 +01:00

omap-mcbsp.h

…

omap-mcpdm.c

ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream

2010-04-05 19:14:11 +01:00

omap-mcpdm.h

…

omap-pcm.c

ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream

2010-04-05 19:14:11 +01:00

omap-pcm.h

…

osk5912.c

…

overo.c

…

sdp3430.c

…

zoom2.c

…