tmp_suning_uos_patched/sound/soc
Mark Brown 0afc8c733e Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
	include/linux/mfd/wm8994/pdata.h
2010-12-06 14:14:47 +00:00
..
atmel Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 11:17:24 +00:00
au1x ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
blackfin ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
codecs Merge branch 'for-2.6.37' into for-2.6.38 2010-12-06 14:14:47 +00:00
davinci Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 11:17:24 +00:00
ep93xx Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 11:17:24 +00:00
fsl ASoC: Add missing dev_set_drvdata in p1022_ds_probe 2010-11-29 18:28:53 +00:00
imx Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 11:17:24 +00:00
jz4740 ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
kirkwood ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
nuc900 Merge branch 'for-2.6.37' into for-2.6.38 2010-11-30 11:35:43 +00:00
omap Merge branch 'for-2.6.37' into for-2.6.38 2010-12-03 17:28:29 +00:00
pxa Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 11:17:24 +00:00
s6000 Merge branch 'for-2.6.37' into for-2.6.38 2010-11-30 11:35:43 +00:00
samsung ASoC: SAMSUNG: Remove duplicated snd_card on smdk_spdif 2010-12-06 14:13:45 +00:00
sh ASoC: sh: fsi: remove runtime register check from fsi_master_xxx 2010-12-03 12:24:15 +00:00
txx9
Kconfig ASoC: Samsung: Rename from s3c24xx to samsung 2010-11-23 14:13:04 +00:00
Makefile ASoC: Samsung: Rename from s3c24xx to samsung 2010-11-23 14:13:04 +00:00
soc-cache.c ASoC: soc-cache: Add optional cache name member to snd_soc_cache_ops 2010-12-06 14:13:46 +00:00
soc-core.c Merge branch 'for-2.6.37' into for-2.6.38 2010-12-06 14:14:47 +00:00
soc-dapm.c ASoC: Add post-CODEC bias level callback for machine driver 2010-12-06 12:41:30 +00:00
soc-jack.c ASoC: Add trace events for jack detection 2010-12-06 14:13:42 +00:00
soc-utils.c