linux/sound/soc
Mark Brown 65fdd5c05a Merge branch 'for-3.0' into for-3.1
Trival fixup for move of I/O code into separate file.

Conflicts:
	sound/soc/soc-cache.c
2011-06-13 19:21:09 +01:00
..
atmel sound/atmel_ssc_dai: add a missing space to an error message 2011-06-10 10:55:20 +01:00
au1x ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
blackfin ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
codecs Merge branch 'for-3.0' into for-3.1 2011-06-09 12:02:26 +01:00
davinci ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
ep93xx ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
fsl Merge branch 'for-3.0' into for-3.1 2011-06-09 12:02:26 +01:00
imx ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
jz4740 ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
kirkwood ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
mid-x86 ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
nuc900 ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
omap ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
pxa ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
s6000 ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
samsung ASoC: SMDKV310: Enable SPDIF device 2011-06-10 11:05:09 +01:00
sh ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
tegra ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
txx9 ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
Kconfig ASoC: tegra: Kconfig and Makefile 2011-01-10 22:21:09 +00:00
Makefile ASoC: Move register I/O code into a separate file 2011-06-13 18:56:10 +01:00
soc-cache.c ASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus 2011-06-13 19:17:55 +01:00
soc-core.c ASoC: core - PCM mutex per rtd 2011-06-09 19:29:29 +01:00
soc-dapm.c ASoC: Add weak routes for sidetone style paths 2011-06-13 18:59:33 +01:00
soc-io.c Merge branch 'for-3.0' into for-3.1 2011-06-13 19:21:09 +01:00
soc-jack.c ASoC: Merge branch 'for-2.6.39' into for-2.6.40 2011-04-18 18:07:43 +01:00
soc-pcm.c ASoC: pcm - rename snd_codec_close() to snd_pcm_close(). 2011-06-09 19:29:35 +01:00
soc-utils.c ASoC: Work around allmodconfig failure 2011-04-28 12:09:06 +01:00