Merge branch 'dt/linus' into dt/next

2020-01-14 11:16:02 -06:00 · 2020-01-14 11:16:02 -06:00 · db0d39aa7f
parent b873c122fe dbce0b6504
commit db0d39aa7f
1 changed files with 1 additions and 0 deletions
--- 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: