Merge branch 'for-2.6.40' into for-2.6.41

2026-09-28 19:20:30 +00:00 · 2011-05-30 10:54:18 +08:00 · 2011-05-30 10:54:18 +08:00 · d21685ec25
commit d21685ec25
parent 74ab24af4f ea02c63d57
45 changed files with 1304 additions and 252 deletions
--- a/6
+++ b/6
--- a/include/sound/ak4641.h
+++ b/include/sound/ak4641.h
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/include/sound/tlv320dac33-plat.h
+++ b/include/sound/tlv320dac33-plat.h
--- a/include/sound/tpa6130a2-plat.h
+++ b/include/sound/tpa6130a2-plat.h
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
--- a/sound/soc/codecs/ak4641.h
+++ b/sound/soc/codecs/ak4641.h
--- a/sound/soc/codecs/dmic.c
+++ b/sound/soc/codecs/dmic.c
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
--- a/sound/soc/codecs/max98088.h
+++ b/sound/soc/codecs/max98088.h
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
--- a/sound/soc/codecs/spdif_transciever.c
+++ b/sound/soc/codecs/spdif_transciever.c
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
--- a/sound/soc/codecs/tlv320dac33.h
+++ b/sound/soc/codecs/tlv320dac33.h
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
--- a/sound/soc/codecs/tpa6130a2.h
+++ b/sound/soc/codecs/tpa6130a2.h
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
--- a/sound/soc/codecs/wm1250-ev1.c
+++ b/sound/soc/codecs/wm1250-ev1.c
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
--- a/sound/soc/codecs/wm8915.c
+++ b/sound/soc/codecs/wm8915.c
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
--- a/sound/soc/omap/omap-pcm.h
+++ b/sound/soc/omap/omap-pcm.h
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
--- a/sound/soc/pxa/Makefile
+++ b/sound/soc/pxa/Makefile
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
--- a/sound/soc/pxa/raumfeld.c
+++ b/sound/soc/pxa/raumfeld.c
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c