aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-05-12 16:05:55 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-05-12 16:05:55 -0400
commitd20bdcfeed0ba049c77c70f2f3efe4d1577838c5 (patch)
treea52d5e86633ec75a40bdb6ec42fb18a8920bcd47 /Documentation
parentfe723c8bd3b6f71672ac8f9c01ab712a8fdd318a (diff)
parentae2a5e128caf100a957cd142818fd7be6276bd11 (diff)
Merge tag 'v3.12.18' into v3.12-rt
This is the 3.12.18 stable release
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/net/micrel-ks8851.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/micrel-ks8851.txt b/Documentation/devicetree/bindings/net/micrel-ks8851.txt
index 11ace3c3d805..4fc392763611 100644
--- a/Documentation/devicetree/bindings/net/micrel-ks8851.txt
+++ b/Documentation/devicetree/bindings/net/micrel-ks8851.txt
@@ -7,3 +7,4 @@ Required properties:
Optional properties:
- local-mac-address : Ethernet mac address to use
+- vdd-supply: supply for Ethernet mac