Merge tag 'v4.14.170' into v4.14.y-multi

author Arne Fitzenreiter <arne_f@ipfire.org>

Wed, 5 Feb 2020 18:07:56 +0000 (19:07 +0100)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Wed, 5 Feb 2020 18:07:56 +0000 (19:07 +0100)
author Arne Fitzenreiter <arne_f@ipfire.org>
Wed, 5 Feb 2020 18:07:56 +0000 (19:07 +0100)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Wed, 5 Feb 2020 18:07:56 +0000 (19:07 +0100)
diff --cc arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
Simple merge
diff --cc drivers/net/usb/r8152.c
Simple merge
diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 5 Feb 2020 18:07:56 +0000 (19:07 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 5 Feb 2020 18:07:56 +0000 (19:07 +0100)
		1	2
arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c	patch \|	diff1 \|	diff2 \|	blob \| history