Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic...

diff --cc sound/soc/codecs/Kconfig
index 4c75425,f31b132,9d88845,cbfa1e1,cbfa1e1,cbfa1e1..a445b44
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
--- 6/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@ -452,13 -446,14 -445,12 -445,10 -445,10 -445,10 +453,17 @@@@@@@ config SND_SOC_RL623
        default y if SND_SOC_RT5640=y
        default y if SND_SOC_RT5645=y
        default y if SND_SOC_RT5651=y
+ ++++  default y if SND_SOC_RT5670=y
+  +++  default y if SND_SOC_RT5677=y
        default m if SND_SOC_RT5640=m
        default m if SND_SOC_RT5645=m
        default m if SND_SOC_RT5651=m
+ ++++  default m if SND_SOC_RT5670=m
+  +++  default m if SND_SOC_RT5677=m
   +++
 +++++config SND_SOC_RT286
 +++++  tristate
 ++   
      config SND_SOC_RT5631
        tristate
      

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/samsung/i2s.c
Simple merge

diff --cc sound/soc/sh/fsi.c
Simple merge