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

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

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

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

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

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

diff --cc sound/soc/codecs/max9768.c
index 4c300f317c3ae08fd75b0a5c8615533a19469877,e1c196a4193033c2cb033c6116076c4269b7dd33,e1c196a4193033c2cb033c6116076c4269b7dd33,e1c196a4193033c2cb033c6116076c4269b7dd33,f987497a8411615c93f65dce50eae5e54820a7b7,e1c196a4193033c2cb033c6116076c4269b7dd33..bd41128c6f0b2280a94ec9fccc40f53455ad6784
--- 1/sound/soc/codecs/max9768.c
--- 2/sound/soc/codecs/max9768.c
--- 3/sound/soc/codecs/max9768.c
--- 4/sound/soc/codecs/max9768.c
--- 5/sound/soc/codecs/max9768.c
--- 6/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@@@@@@ -218,8 -242,10 -242,10 -242,10 -242,9 -242,10 +218,8 @@@@@@@ MODULE_DEVICE_TABLE(i2c, max9768_i2c_id
      static struct i2c_driver max9768_i2c_driver = {
        .driver = {
                .name = "max9768",
 --- -          .owner = THIS_MODULE,
        },
        .probe = max9768_i2c_probe,
 -----  .remove = max9768_i2c_remove,
        .id_table = max9768_i2c_id,
      };
      module_i2c_driver(max9768_i2c_driver);

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

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

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

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

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