]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'for-next/ffa' into for-next/core
authorWill Deacon <will@kernel.org>
Wed, 2 Jun 2021 17:00:11 +0000 (18:00 +0100)
committerWill Deacon <will@kernel.org>
Wed, 2 Jun 2021 17:00:11 +0000 (18:00 +0100)
* for-next/ffa:
  arm64: smccc: Add support for SMCCCv1.2 extended input/output registers

1  2 
arch/arm64/kernel/asm-offsets.c

Simple merge