Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc...

diff --cc sound/soc/blackfin/Kconfig
index b2107918f0ad06d1a740adf9ff1a818fd7d920d6,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,f9118dc98853e124f95cf77e8c3d2fcda1961961,54f74f8cbb754a0e66aecc3953fff0c8ba63966c..6347d5910138cbcd5eef0478b0fb53bca9636de6
--- 1/sound/soc/blackfin/Kconfig
--- 2/sound/soc/blackfin/Kconfig
--- 3/sound/soc/blackfin/Kconfig
--- 4/sound/soc/blackfin/Kconfig
--- 5/sound/soc/blackfin/Kconfig
--- 6/sound/soc/blackfin/Kconfig
--- 7/sound/soc/blackfin/Kconfig
--- 8/sound/soc/blackfin/Kconfig
--- 9/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
@@@@@@@@@@ -11,10 -11,10 -11,10 -11,10 -11,10 -11,10 -11,10 -11,11 -11,10 +11,11 @@@@@@@@@@ config SND_BF5XX_I2
         
         config SND_BF5XX_SOC_SSM2602
                tristate "SoC SSM2602 Audio Codec Add-On Card support"
 --------       depends on SND_BF5XX_I2S && (SPI_MASTER || I2C)
 ++++++++       depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI
                select SND_BF5XX_SOC_I2S if !BF60x
                select SND_BF6XX_SOC_I2S if BF60x
------- -       select SND_SOC_SSM2602
+++++++ +       select SND_SOC_SSM2602_SPI if SPI_MASTER
+++++++ +       select SND_SOC_SSM2602_I2C if I2C
                help
                  Say Y if you want to add support for the Analog Devices
                  SSM2602 Audio Codec Add-On Card.

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

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