linux/sound/soc
Vinod Koul e0d23ef29e Merge branch 'dma_slave_direction' into next_test_dirn
resolved conflicts:
	drivers/media/video/mx3_camera.c
2011-11-17 14:54:57 +05:30
..
atmel ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
au1x Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
blackfin sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
codecs Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
davinci Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2011-10-28 14:25:01 -07:00
ep93xx Merge branch 'dma_slave_direction' into next_test_dirn 2011-11-17 14:54:57 +05:30
fsl ASoC: fsl: Fix error handling if platform_device_add fails 2011-09-20 12:58:59 +01:00
imx Merge branch 'dma_slave_direction' into next_test_dirn 2011-11-17 14:54:57 +05:30
jz4740 ASoC: Staticise jz4740_pcm_new() 2011-09-21 14:55:50 +01:00
kirkwood ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
mid-x86 sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
mxs ASoC: keep pointer to resource so it can be freed 2011-10-22 10:46:35 +01:00
nuc900 Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
omap sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
pxa sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s6000 ASoC: s6000-pcm: remove unused variable 'dai' 2011-08-15 22:51:48 +09:00
samsung Merge branch 'dma_slave_direction' into next_test_dirn 2011-11-17 14:54:57 +05:30
sh Merge branch 'dma_slave_direction' into next_test_dirn 2011-11-17 14:54:57 +05:30
tegra sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
txx9 Merge branch 'dma_slave_direction' into next_test_dirn 2011-11-17 14:54:57 +05:30
Kconfig Merge branch 'regmap-asoc' into for-3.2 2011-08-08 15:00:13 +09:00
Makefile ASoC: mxs: add asoc configuration files 2011-07-28 11:47:41 +01:00
soc-cache.c sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed 2011-10-31 19:31:22 -04:00
soc-core.c Merge branch 'topic/remove-irqf_disable' into for-linus 2011-10-26 23:51:48 +02:00
soc-dapm.c ASoC: Fix DAPM sync for TLV320AIC3x custom DAPM widget 2011-10-10 10:28:26 +01:00
soc-io.c sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed 2011-10-31 19:31:22 -04:00
soc-jack.c sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed 2011-10-31 19:31:22 -04:00
soc-pcm.c ASoC: core: Add flag to ignore pmdown_time at pcm_close 2011-10-14 20:42:21 +01:00
soc-utils.c sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed 2011-10-31 19:31:22 -04:00