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

diff --cc MAINTAINERS
index 3f723113113719fbb2beb50b309ab7776130b53c,aa71ab52fd76d1607b36f476dde8e0060f500070,aa71ab52fd76d1607b36f476dde8e0060f500070,8254a90d1cbda3db0930a0ff4fd9edcedc14a3d5,761aa3c063601f0e427dfd7b472fb5c132f60fa0..c00bea0883bf2de75ee63566e3113d0d60f08f1e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -2047,10 -2046,10 -2046,10 -2046,10 -2033,9 +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/
@@@@@@ -10128,14 -10129,14 -10129,14 -10129,14 -10031,10 +10128,14 @@@@@@ T:    git git://github.com/openrisc/linux.
     L: [email protected]
     W: http://openrisc.io
     S: Maintained
    +F: Documentation/devicetree/bindings/openrisc/
    +F: Documentation/openrisc/
     F: arch/openrisc/
    +F: drivers/irqchip/irq-ompic.c
    +F: drivers/irqchip/irq-or1k-*
     
     OPENVSWITCH
 ----M: Pravin Shelar <[email protected]>
 ++++M: Pravin B Shelar <[email protected]>
     L: [email protected]
     L: [email protected]
     W: http://openvswitch.org
@@@@@@ -13489,19 -13469,18 -13469,18 -13469,18 -13288,8 +13489,19 @@@@@@ M:     Andreas Noever <andreas.noever@gmail
     M: Michael Jamet <[email protected]>
     M: Mika Westerberg <[email protected]>
     M: Yehezkel Bernat <[email protected]>
    +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 <[email protected]>
    +M: Mika Westerberg <[email protected]>
    +M: Yehezkel Bernat <[email protected]>
    +L: [email protected]
    +S: Maintained
    +F: drivers/net/thunderbolt.c
     
     THUNDERX GPIO DRIVER
     M: David Daney <[email protected]>

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

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