Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927', 'asoc...

diff --cc sound/soc/codecs/Kconfig
index 70decab5e9855e91b85b65ee7559a53f55d01a84,9e1718a8cb1ce20a0fd68e2cbe797653b39aadeb,65e31ab88280ee3c1c60328de87ba84f7f9d69de,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01,e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01..1957521eabcd906a05db817fcbae69568f845dca
--- 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
@@@@@@ -538,15 -524,11 -525,11 -525,12 -525,12 +539,15 @@@@@@ config SND_SOC_HDMI_CODE
        select SND_PCM_IEC958
        select HDMI
     
 ++++config SND_SOC_ES7134
 ++++       tristate "Everest Semi ES7134 CODEC"
 ++++
     config SND_SOC_ES8328
 --     tristate "Everest Semi ES8328 CODEC"
 ++     tristate
     
     config SND_SOC_ES8328_I2C
 --     tristate
 ++     tristate "Everest Semi ES8328 CODEC (I2C)"
 ++     depends on I2C
        select SND_SOC_ES8328
     
     config SND_SOC_ES8328_SPI

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

diff --cc sound/soc/codecs/max9867.c
Simple merge