From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 May 2021 22:48:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'phy/fixes'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d7c337ffc103e9be69ffe108e5a7d22a13ebeef;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'phy/fixes'

# Conflicts:
#	drivers/phy/qualcomm/phy-qcom-qmp.c
---

0d7c337ffc103e9be69ffe108e5a7d22a13ebeef