Merge branch 'topic/asoc' into for-next

diff --cc sound/soc/codecs/tlv320aic3x.c
index 5be580e8834488ee8836e4336fcfcc17eef91434,584bc1e67f763dd892c6af4b7ae8874c52b2220d..b2c2794259936d0f29fc63fb073e9264e9735caf
--- 1/sound/soc/codecs/tlv320aic3x.c
--- 2/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@ -38,8 -38,8 +38,9 @@@
  #include <linux/delay.h>
  #include <linux/pm.h>
  #include <linux/i2c.h>
+ #include <linux/regulator/consumer.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>

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