From: Will Deacon <will@kernel.org>
Date: Wed, 26 May 2021 16:14:43 +0000 (+0100)
Subject: Merge branch 'for-next/ffa' into for-next/smccc
X-Git-Tag: block-5.14-2021-07-08~74^2~1^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=57ad4fe0859ec6dd15776cae6ee8a139492334fd;p=linux-2.6-block.git

Merge branch 'for-next/ffa' into for-next/smccc

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
---

57ad4fe0859ec6dd15776cae6ee8a139492334fd