From: Mark Brown Date: Fri, 12 Jan 2018 12:29:37 +0000 (+0000) Subject: Merge remote-tracking branches 'asoc/topic/tscs42xx', 'asoc/topic/twl4030', 'asoc... X-Git-Tag: v4.16-rc1~197^2~10^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=535f9af41b8277309c8aea9a3f8c6fb06d63b6a5;p=thirdparty%2Fkernel%2Flinux.git Merge remote-tracking branches 'asoc/topic/tscs42xx', 'asoc/topic/twl4030', 'asoc/topic/twl6040' and 'asoc/topic/uda1380' into asoc-next --- 535f9af41b8277309c8aea9a3f8c6fb06d63b6a5 diff --cc MAINTAINERS index 53ccad1b166e3,8254a90d1cbda,761aa3c063601,aa71ab52fd76d,aa71ab52fd76d..8e4d79ad1371c --- a/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 M: Mika Westerberg M: Yehezkel Bernat + 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 + M: Mika Westerberg + M: Yehezkel Bernat + L: netdev@vger.kernel.org + S: Maintained + F: drivers/net/thunderbolt.c THUNDERX GPIO DRIVER M: David Daney