From: Nick Xie <nick@khadas.com>
Date: Wed, 27 May 2020 09:52:04 +0000 (+0800)
Subject: Merge tag 'v4.9.209' into khadas-vims-4.9.y
X-Git-Tag: khadas-vims-v0.9.6-release~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41c0e98e3ae61065d9b9978987b5e6e128dae32e;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'v4.9.209' into khadas-vims-4.9.y

This is the 4.9.209 stable release

 Conflicts:
	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
---

41c0e98e3ae61065d9b9978987b5e6e128dae32e