diff options
| author |   Will Deacon <will.deacon@arm.com> | 2015-08-05 14:14:06 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-08-05 14:14:06 +0100 |
| commit | d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4 (patch) | |
| tree | a4769135920d8ec4ded9569f89c231130980ba42 /arch/arm64/include/asm/traps.h | |
| parent | arm64: mm: ensure patched kernel text is fetched from PoU (diff) | |
| parent | MAINTAINERS: add PSCI entry (diff) | |
| download | linux-dev-d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4.tar.xz linux-dev-d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4.zip | |
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
Diffstat (limited to 'arch/arm64/include/asm/traps.h')
0 files changed, 0 insertions, 0 deletions