| commit | d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4 | [log] [tgz] |
|---|---|---|
| author | Will Deacon <will.deacon@arm.com> | Wed Aug 05 14:14:06 2015 +0100 |
| committer | Will Deacon <will.deacon@arm.com> | Wed Aug 05 14:14:06 2015 +0100 |
| tree | a4769135920d8ec4ded9569f89c231130980ba42 | |
| parent | 8ec41987436d566f7c4559c6871738b869f7ef07 [diff] | |
| parent | 514f161abcda065914f7ea8954c815eee98074a5 [diff] |
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