Merge remote-tracking branches 'asoc/topic/tscs42xx', 'asoc/topic/twl4030', 'asoc...

diff --cc MAINTAINERS
index 53ccad1,8254a90,761aa3c,aa71ab5,aa71ab5..8e4d79a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -2047,10 -2046,10 -2033,9 -2046,10 -2046,10 +2047,10 @@@@@@ F:   arch/arm/boot/dts/uniphier
     F: arch/arm/include/asm/hardware/cache-uniphier.h
     F: arch/arm/mach-uniphier/
     F: arch/arm/mm/cache-uniphier.c
 ----F: arch/arm64/boot/dts/socionext/
 ++++F: arch/arm64/boot/dts/socionext/uniphier*
     F: drivers/bus/uniphier-system-bus.c
     F: drivers/clk/uniphier/
  +  F: drivers/gpio/gpio-uniphier.c
     F: drivers/i2c/busses/i2c-uniphier*
     F: drivers/irqchip/irq-uniphier-aidet.c
     F: drivers/pinctrl/uniphier/
@@@@@@ -13489,19 -13469,18 -13288,8 -13469,18 -13469,18 +13489,19 @@@@@@ M:     Andreas Noever <andreas.noever@gmail
     M: Michael Jamet <michael.jamet@intel.com>
     M: Mika Westerberg <mika.westerberg@linux.intel.com>
     M: Yehezkel Bernat <yehezkel.bernat@intel.com>
  +  T: git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
     S: Maintained
 ++++F: Documentation/admin-guide/thunderbolt.rst
     F: drivers/thunderbolt/
  +  F: include/linux/thunderbolt.h
  +  
  +  THUNDERBOLT NETWORK DRIVER
  +  M: Michael Jamet <michael.jamet@intel.com>
  +  M: Mika Westerberg <mika.westerberg@linux.intel.com>
  +  M: Yehezkel Bernat <yehezkel.bernat@intel.com>
  +  L: netdev@vger.kernel.org
  +  S: Maintained
  +  F: drivers/net/thunderbolt.c
     
     THUNDERX GPIO DRIVER
     M: David Daney <david.daney@cavium.com>

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

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