]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'arm64/for-next/core'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:07:09 +0000 (09:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:07:09 +0000 (09:07 +1000)
commit95e036140e3f2220e6da853efe59f09babfef2d1
treeb3660737b37fe704e459d146f74a6bfcf77909ce
parentfdb5d5d066099e07ffa7ee919e2fe222dd091838
parent5d8505fd039c1e757ad3490e46fe0fe73d78e2e0
Merge remote-tracking branch 'arm64/for-next/core'

# Conflicts:
# arch/arm64/kernel/alternative.c
arch/arm64/Kconfig
arch/arm64/include/asm/memory.h
arch/arm64/kernel/alternative.c
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/process.c
arch/arm64/kernel/stacktrace.c
arch/arm64/mm/init.c
arch/arm64/mm/mmu.c
drivers/firmware/psci/psci.c