Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04
authorBJ DevOps Team <bjdevops@NXP1.onmicrosoft.com>
Thu, 27 May 2021 06:46:28 +0000 (08:46 +0200)
committerBJ DevOps Team <bjdevops@NXP1.onmicrosoft.com>
Thu, 27 May 2021 06:46:28 +0000 (08:46 +0200)
* origin/ls_v2021.04:
  net: phy: inphi in112525 gen1/gen2 retimers support

1  2 
configs/lx2160aqds_tfa_defconfig
configs/lx2160ardb_tfa_defconfig

Simple merge
Simple merge