Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/intel', 'asoc/fix/rt286', 'asoc/fix/rt5640', 'asoc/fix/samsung', 'asoc/fix/sgtl5000', 'asoc/fix/sta32x', 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8731' into asoc-linus

2026-09-28 19:20:30 +00:00 · 2015-02-09 15:09:49 +08:00 · 2015-02-09 15:09:49 +08:00 · 0cee4db21e
commit 0cee4db21e
parent b34510b70d f8d71be555 20cf2603b1 279e17ae81 28d1ad09c5 3463667aa1 fddcd30073 58cc9c9a17 b0402717c9 0b65ba9981 8a6cf30bf9
17 changed files with 103 additions and 83 deletions
--- a/10
+++ b/10
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
--- a/sound/soc/codecs/sta32x.h
+++ b/sound/soc/codecs/sta32x.h
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
--- a/sound/soc/intel/sst/sst.h
+++ b/sound/soc/intel/sst/sst.h
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
--- a/sound/soc/soc-ac97.c
+++ b/sound/soc/soc-ac97.c