leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dcf7ec5ee6
linux/sound/soc
History
Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers 
Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 16:16:29 +00:00
..
atmel ASoC: drop support for PlayPaq with WM8510 2011-11-23 10:28:38 +00: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 ASoC: wm8776: add missing break in sample size switch 2011-12-23 18:03:21 +00: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 sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
fsl ASoC: mpc8610: tell the CS4270 codec that it's the master 2011-11-22 23:06:25 +00:00
imx ASoC: Make SND_SOC_MX27VIS_AIC32X4 depend on I2C 2011-12-04 23:47:16 +00:00
jz4740 ASoC: Staticise jz4740_pcm_new() 2011-09-21 14:55:50 +01:00
kirkwood ASoC: kirkwood: Make SND_KIRKWOOD_SOC_OPENRD and SND_KIRKWOOD_SOC_T5325 depend on I2C 2011-12-03 10:56:47 +00:00
mid-x86 sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
mxs Merge branch 'v3.2-rc6' into next/drivers 2011-12-27 23:41:33 +00:00
nuc900 ARM: 7175/1: add subname parameter to mfp_set_groupg callers 2011-11-26 21:58:54 +00:00
omap sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
pxa ASoC: Fix hx4700 error handling to free gpios if snd_soc_register_card fails 2011-12-12 12:58:42 +08:00
s6000 ASoC: s6000-pcm: remove unused variable 'dai' 2011-08-15 22:51:48 +09:00
samsung ASoC: Include linux/module.h for smdk2443_wm9710 2011-12-08 00:12:12 +08:00
sh sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
tegra sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
txx9 Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
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 ASoC: skip resume of soc-audio devices without codecs 2011-11-23 14:56:36 +00: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 ASoC: Provide a more complete DMA driver stub 2011-12-06 10:05:07 +00:00