Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc...

diff --cc include/sound/soc-dapm.h
Simple merge

diff --cc include/sound/soc.h
index f10f48fad5d53c860054032d0be221d3da687b5a,bfd84a7edfa578dafea2cd6948223f161ea52ebf,fcb312b3f25809e781098e2bd2514ae89f59329f,fcb312b3f25809e781098e2bd2514ae89f59329f,fcb312b3f25809e781098e2bd2514ae89f59329f,fcb312b3f25809e781098e2bd2514ae89f59329f..93df8bf9d54a9e1b9502836faec752b4c6aa20b0
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
--- 3/include/sound/soc.h
--- 4/include/sound/soc.h
--- 5/include/sound/soc.h
--- 6/include/sound/soc.h
+++ b/include/sound/soc.h
@@@@@@@ -1212,7 -1207,8 -1188,6 -1188,6 -1188,6 -1188,6 +1222,8 @@@@@@@ struct soc_enum 
        unsigned int mask;
        const char * const *texts;
        const unsigned int *values;
  ++++  unsigned int autodisable:1;
+ ++++  struct snd_soc_dobj dobj;
      };
      
      /**

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

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

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

diff --cc sound/soc/soc-core.c
Simple merge