aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-11-09 18:48:44 +0800
committerAlex Shi <alex.shi@linaro.org>2015-11-09 18:48:44 +0800
commit82c795655f6297b9efdcee2643ff937e1849ad83 (patch)
tree1f472a1bfc53795c82601fe2c6769ea2a2ce555e /Documentation
parent9ce0d731981a1489331e12bb7f94907438515622 (diff)
parent38f3e89d3935a8b43a05b33d738d7f597f3a60ae (diff)
downloadlinux-linaro-stable-82c795655f6297b9efdcee2643ff937e1849ad83.tar.gz
Merge remote-tracking branch 'origin/v3.18/topic/OPPv2' into linux-linaro-lsk-v3.18
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/opp/opp.txt (renamed from Documentation/devicetree/bindings/power/opp.txt)0
1 files changed, 0 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/power/opp.txt b/Documentation/devicetree/bindings/opp/opp.txt
index 74499e5033fc..74499e5033fc 100644
--- a/Documentation/devicetree/bindings/power/opp.txt
+++ b/Documentation/devicetree/bindings/opp/opp.txt