Skip to content
Commit d422e625 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'aarch64/psci/drivers' into aarch64/for-next/core 

Move our PSCI implementation out into drivers/firmware/ where it can be
shared with arch/arm/.

Conflicts:
	arch/arm64/kernel/psci.c
parents 8ec41987 514f161a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment