Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc...

diff --cc include/sound/soc-dapm.h
Simple merge

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/codecs/Kconfig
index 0bddd92,064e6c1,064e6c1,0ccce5a,064e6c1..061c465
--- 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
+++ b/sound/soc/codecs/Kconfig
@@@@@@ -69,7 -69,7 -69,7 -69,8 -69,7 +69,8 @@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_MAX98088 if I2C
        select SND_SOC_MAX98090 if I2C
        select SND_SOC_MAX98095 if I2C
 -- -   select SND_SOC_MAX98357A
 ++ +   select SND_SOC_MAX98357A if GPIOLIB
+++ +   select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX9850 if I2C
        select SND_SOC_MAX9768 if I2C
        select SND_SOC_MAX9877 if I2C

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

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/soc-dapm.c
Simple merge