1
linux/sound/soc
Mark Brown 43a9519758 Merge branch 'for-3.2' into for-3.3
Conflicts:
	sound/soc/mxs/mxs-pcm.c
2011-12-11 11:24:44 +08:00
..
atmel ASoC: Convert atmel directory to module_platform_driver 2011-11-25 13:15:01 +00:00
au1x ASoC: Convert au1x directory to module_platform_driver 2011-11-25 13:15:16 +00:00
blackfin ASoC: Convert blackfin directory to module_platform_driver 2011-11-24 10:45:18 +00:00
codecs Merge branch 'for-3.2' into for-3.3 2011-12-11 03:01:33 +08:00
davinci ASoC: Convert davinci directory to module_platform_driver 2011-11-25 13:15:31 +00:00
ep93xx ASoC: Convert ep93xx directory to module_platform_driver 2011-11-24 10:43:59 +00:00
fsl ASoC: fsl/powerpc: don't rely on the cell-index property 2011-12-02 10:37:18 +00:00
imx Merge branch 'for-3.2' into for-3.3 2011-12-04 23:47:39 +00:00
jz4740 ASoC: Convert jz4740 directory to module_platform_driver 2011-11-24 10:45:19 +00:00
kirkwood Merge branch 'for-3.2' into for-3.3 2011-12-03 11:07:43 +00:00
mid-x86 ASoC: sst_platform: fix the dsp driver interface 2011-12-05 14:02:31 +00:00
mxs Merge branch 'for-3.2' into for-3.3 2011-12-11 11:24:44 +08:00
nuc900 ASoC: Convert nuc900 directory to module_platform_driver 2011-11-24 10:45:20 +00:00
omap ASoC: Use core pm_runtime callbacks for omap-mcpdm 2011-12-08 09:22:04 +08:00
pxa ASoC: Convert e800_wm9712 to use gpio_request_one() 2011-12-08 00:14:19 +08:00
s6000 ASoC: Convert s6000 directory to module_platform_driver 2011-11-24 10:45:14 +00:00
samsung Merge branch 'for-3.2' into for-3.3 2011-12-08 00:15:39 +08:00
sh ASoC: Convert sh directory to module_platform_driver 2011-11-25 13:15:29 +00:00
tegra ASoC: Tegra: Move DAS configuration into DAS driver 2011-12-08 12:34:07 +08:00
txx9 ASoC: Convert txx9 directory to module_platform_driver 2011-11-25 13:15:30 +00:00
Kconfig ASoC: Remove LZO cache type 2011-11-10 13:08:09 +00:00
Makefile ASoC: mxs: add asoc configuration files 2011-07-28 11:47:41 +01:00
soc-cache.c ASoC: Remove LZO cache type 2011-11-10 13:08:09 +00:00
soc-core.c ASoC: Fix an obvious copy paste error in an error message 2011-12-11 10:59:49 +08:00
soc-dapm.c ASoC: Take a pm_runtime reference on DAPM devices that are enabled 2011-12-08 09:22:36 +08: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: Hold runtime PM references to components of active DAIs 2011-12-08 09:21:45 +08:00
soc-utils.c ASoC: Provide a more complete DMA driver stub 2011-12-06 10:05:07 +00:00