Merge tag 'v4.14.171' into v4.14.y-traverse

author Arne Fitzenreiter <arne_f@ipfire.org>

Thu, 27 Feb 2020 17:41:15 +0000 (18:41 +0100)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Thu, 27 Feb 2020 17:41:15 +0000 (18:41 +0100)
author Arne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Feb 2020 17:41:15 +0000 (18:41 +0100)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Feb 2020 17:41:15 +0000 (18:41 +0100)
diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
Simple merge
diff --cc drivers/net/ethernet/freescale/fman/fman_memac.c
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Thu, 27 Feb 2020 17:41:15 +0000 (18:41 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Thu, 27 Feb 2020 17:41:15 +0000 (18:41 +0100)
		1	2
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fman/fman_memac.c	patch \|	diff1 \|	diff2 \|	blob \| history