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

ASoC: Adding OMAP3517 / AM3517 EVM support in ASOC

2009-10-29 22:28:18 +00:00

ams-delta.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2009-12-08 08:15:29 -08:00

igep0020.c

ASoC: Add support for IGEP v2

2009-11-19 10:48:43 +00:00

Kconfig

ASoC: OMAP4: Add McPDM platform driver

2010-02-23 10:41:05 +00:00

Makefile

ASoC: OMAP4: Add McPDM platform driver

2010-02-23 10:41:05 +00:00

mcpdm.c

ASoC: McPDM: Use tabs for indentation

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

mcpdm.h

ASoC: OMAP4: Add support for McPDM

2010-02-23 10:39:48 +00:00

n810.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

omap2evm.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

omap3beagle.c

Add ASoC support for Devkit8000

2010-02-11 19:49:48 +00:00

omap3evm.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2009-12-08 08:15:29 -08:00

omap3pandora.c

ASoC: pandora: Add DAC regulator support

2010-02-05 17:08:16 +00:00

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

ASoC: OMAP-McBSP: ASoC interface for McBSP sidetone

2010-02-23 10:57:39 -08:00

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

ASoC: OMAP4: Add McPDM platform driver

2010-02-23 10:41:05 +00:00

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

ASoC: OMAP: data_type and sync_mode configurable in audio dma

2010-02-23 10:38:52 +00:00

osk5912.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

overo.c

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2009-12-08 08:15:29 -08:00

sdp3430.c

mfd: twl: fix twl4030 rename for remaining driver, board files

2009-12-16 12:44:04 -08:00

zoom2.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00