From: Mark Brown <broonie@kernel.org>
Date: Fri, 5 Jan 2018 12:44:13 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/tsc42xx', 'asoc... 
X-Git-Tag: v4.19~1776^2~16^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04df320d46da61e72057ca6f3db0432b28d5d5b1;p=platform%2Fkernel%2Flinux-rpi3.git

Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/tsc42xx', 'asoc/topic/twl4030', 'asoc/topic/twl6040' and 'asoc/topic/uda1380' into asoc-next
---

04df320d46da61e72057ca6f3db0432b28d5d5b1
diff --cc MAINTAINERS
index 78b1e02,aa71ab52f,8254a90,761aa3c,aa71ab52f,aa71ab52f..acc764b
--- a/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>