Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/tsc42xx', 'asoc...

diff --cc MAINTAINERS
index 78b1e02fd01cfed1e0d5380ec39f8264d26a7664,aa71ab52fd76d1607b36f476dde8e0060f500070,8254a90d1cbda3db0930a0ff4fd9edcedc14a3d5,761aa3c063601f0e427dfd7b472fb5c132f60fa0,aa71ab52fd76d1607b36f476dde8e0060f500070,aa71ab52fd76d1607b36f476dde8e0060f500070..acc764baefdadc05bb33fd0aa6cb560aea4d58fb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -2047,10 -2046,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/
@@@@@@@ -13490,19 -13469,18 -13469,18 -13288,8 -13469,18 -13469,18 +13490,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