Merge branch 'dt/linus' into dt/next

db0d39aa · Rob Herring · b873c122 · dbce0b65 · db0d39aa
Commit db0d39aa authored Jan 14, 2020 by Rob Herring
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Documentation/devicetree/bindings/net/snps,dwmac.yaml Documentation/devicetree/bindings/net/snps,dwmac.yaml +1 -0

No files found.
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -347,6 +347,7 @@ allOf:
              - st,spear600-gmac
    then:
+      properties:
        snps,tso:
          $ref: /schemas/types.yaml#definitions/flag
          description: