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

diff --cc sound/soc/codecs/max98090.c
index 9b76f5a4511511125121b493632b85e109f7715b,8857be798f3b221e2e2e9bb4374c3ac81c638cea,f7b0b37aa85827e7cd45a8afda039078c7079f0e..f5fccc7a8e89b59b42911fb5684d8ab31b775b52
--- 1/sound/soc/codecs/max98090.c
--- 2/sound/soc/codecs/max98090.c
--- 3/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@ -16,7 -15,8 -15,6 +16,8 @@@@
   #include <linux/pm_runtime.h>
   #include <linux/regmap.h>
   #include <linux/slab.h>
  +#include <linux/acpi.h>
+ +#include <linux/clk.h>
   #include <sound/jack.h>
   #include <sound/pcm.h>
   #include <sound/pcm_params.h>

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