diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:10:28 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:10:28 +0200 |
commit | 82fc167c392a1700f9adbde639730ee8c8122474 (patch) | |
tree | 373ab737a040dd21e5f98425e7c82a6cc4a83568 /Documentation/devicetree/bindings/arm/idle-states.txt | |
parent | e3e72ab80a3fac0b88e07d358a2c75724ccd66b4 (diff) | |
parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
download | linux-82fc167c392a1700f9adbde639730ee8c8122474.tar.gz linux-82fc167c392a1700f9adbde639730ee8c8122474.tar.xz |
Merge tag 'v4.3-rc4' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/arm/idle-states.txt')
-rw-r--r-- | Documentation/devicetree/bindings/arm/idle-states.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/idle-states.txt b/Documentation/devicetree/bindings/arm/idle-states.txt index a8274eabae2e..b8e41c148a3c 100644 --- a/Documentation/devicetree/bindings/arm/idle-states.txt +++ b/Documentation/devicetree/bindings/arm/idle-states.txt @@ -497,7 +497,7 @@ cpus { }; idle-states { - entry-method = "arm,psci"; + entry-method = "psci"; CPU_RETENTION_0_0: cpu-retention-0-0 { compatible = "arm,idle-state"; |