Merge branch 'for-next/ffa' into for-next/smccc
authorWill Deacon <will@kernel.org>
Wed, 26 May 2021 16:14:43 +0000 (17:14 +0100)
committerWill Deacon <will@kernel.org>
Wed, 26 May 2021 16:14:43 +0000 (17:14 +0100)
Merge in SMCCC update from Sudeep, which is a branch shared with arm-soc
for the FF-A driver work.

* for-next/ffa:
  arm64: smccc: Add support for SMCCCv1.2 extended input/output registers


Trivial merge