diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-15 11:18:28 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-15 11:18:28 -0700 |
| commit | 3e35437046080c7bd7fb4eab67e690978d7d14fd (patch) | |
| tree | 3c6c5156f48458364b99b0e18a0ba7ce19fcbe41 /COPYING | |
| parent | be347417413420b5b07e123b5ff3508f35e15901 (diff) | |
| parent | 7e3ec66bcbe3abda010db0d6cd965d02c059ed35 (diff) | |
Merge branch 'v3.18/topic/for-stable' into linux-linaro-lsk-v3.18
* v3.18/topic/for-stable:
arm64: psci: move psci firmware calls out of line
ARM: 8307/1: psci: move psci firmware calls out of line
Conflicts:
arch/arm64/kernel/Makefile
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions