From: Mark Brown <broonie@kernel.org>
Date: Thu, 18 Jan 2018 11:56:24 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/tlv320dac33', 'asoc/topic/ts3a227e', ... 
X-Git-Tag: v4.19~1776^2~1^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04a1254cbaddb231cba866f1b8803efeb7d3d7a1;p=platform%2Fkernel%2Flinux-rpi3.git

Merge remote-tracking branches 'asoc/topic/tlv320dac33', 'asoc/topic/ts3a227e', 'asoc/topic/tscs42xx' and 'asoc/topic/twl4030' into asoc-next
---

04a1254cbaddb231cba866f1b8803efeb7d3d7a1
diff --cc MAINTAINERS
index 3f72311,aa71ab52f,aa71ab52f,8254a90,761aa3c..c00bea0
--- a/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:	openrisc@lists.librecores.org
     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 <pshelar@nicira.com>
 ++++M:	Pravin B Shelar <pshelar@ovn.org>
     L:	netdev@vger.kernel.org
     L:	dev@openvswitch.org
     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 <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>