Merge remote-tracking branches 'asoc/topic/inntel', 'asoc/topic/input', 'asoc/topic...

diff --combined sound/soc/codecs/Kconfig
index 2aa709a0e87a8bffb5fe81b6b676cdfcbc54efb0,c67667bb970f1729db65b027dd8e963b9ee95b7b,c67667bb970f1729db65b027dd8e963b9ee95b7b,b51d490ba325956416e1dec31fbd8e5de640ed2e,c67667bb970f1729db65b027dd8e963b9ee95b7b..fb96959665fabe2f7f7c48e3c17f38c9b4364948
--- 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
@@@@@@ -48,8 -48,6 -48,6 -48,6 -48,6 +48,8 @@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS35L32 if I2C
        select SND_SOC_CS35L33 if I2C
 ++++   select SND_SOC_CS35L34 if I2C
 ++++   select SND_SOC_CS42L42 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L56 if I2C && INPUT
@@@@@@ -85,6 -83,6 -83,6 -83,7 -83,6 +85,7 @@@@@@
        select SND_SOC_MAX98095 if I2C
        select SND_SOC_MAX98357A if GPIOLIB
        select SND_SOC_MAX98371 if I2C
+++ +   select SND_SOC_MAX98504 if I2C
        select SND_SOC_MAX9867 if I2C
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
@@@@@@ -401,14 -399,6 -399,6 -400,6 -399,6 +402,14 @@@@@@ config SND_SOC_CS35L3
        tristate "Cirrus Logic CS35L33 CODEC"
        depends on I2C
     
 ++++config SND_SOC_CS35L34
 ++++   tristate "Cirrus Logic CS35L34 CODEC"
 ++++   depends on I2C
 ++++
 ++++config SND_SOC_CS42L42
 ++++   tristate "Cirrus Logic CS42L42 CODEC"
 ++++   depends on I2C
 ++++
     config SND_SOC_CS42L51
        tristate