Commit d4fe9117 authored by Tetsuo Handa's avatar Tetsuo Handa
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

parents ae7e63d1 ed8780e3

Documentation/devicetree/bindings/arm/actions.yaml

+2 −0
Original line number Diff line number Diff line
@@ -49,3 +49,5 @@ properties: 
          - enum:

              - ucrobotics,bubblegum-96 # uCRobotics Bubblegum-96

          - const: actions,s900



additionalProperties: true

Documentation/devicetree/bindings/arm/altera.yaml

+3 −0
Original line number Diff line number Diff line
@@ -19,4 +19,7 @@ properties: 
          - altr,socfpga-arria5

          - altr,socfpga-arria10

      - const: altr,socfpga



additionalProperties: true



...

Documentation/devicetree/bindings/arm/amazon,al.yaml

+2 −0
Original line number Diff line number Diff line
@@ -30,4 +30,6 @@ properties: 
              - amazon,al-alpine-v3-evp

          - const: amazon,al-alpine-v3



additionalProperties: true



...

Documentation/devicetree/bindings/arm/amlogic.yaml

+3 −0
Original line number Diff line number Diff line
@@ -173,4 +173,7 @@ properties: 
          - enum:

              - amlogic,ad401

          - const: amlogic,a1



additionalProperties: true



...

Documentation/devicetree/bindings/arm/arm,integrator.yaml

+2 −0
Original line number Diff line number Diff line
@@ -83,4 +83,6 @@ required: 
  - compatible

  - core-module@10000000



additionalProperties: true



...