From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 9 Jul 2020 06:02:06 +0000 (+1000)
Subject: Merge branch 'ux500'
X-Git-Tag: howlett/maple_spf/20210104~1418^2~115
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=95a62311edf3677c5b1d5ab74380dfa51e5f6b03;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'ux500'

The change on the ux500 branch is needed by the regulator API.
---

95a62311edf3677c5b1d5ab74380dfa51e5f6b03