diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-25 09:13:52 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-25 09:13:52 -0300 |
| commit | 100475f83b9d2fbdb6f34a9b5fca9318e039b2d6 (patch) | |
| tree | 630d9e2403541d9005ecf4a9aca52ca0befab217 /Documentation/devicetree/bindings/input/input.yaml | |
| parent | 19d71c2cbe060ca8b7da0a43ee549f8352211155 (diff) | |
| parent | a050a6d2b7e80ca52b2f4141eaf3420d201b72b3 (diff) | |
| download | lwn-100475f83b9d2fbdb6f34a9b5fca9318e039b2d6.tar.gz lwn-100475f83b9d2fbdb6f34a9b5fca9318e039b2d6.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'Documentation/devicetree/bindings/input/input.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/input/input.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/input/input.yaml b/Documentation/devicetree/bindings/input/input.yaml index 74244d21d2b3..d41d8743aad4 100644 --- a/Documentation/devicetree/bindings/input/input.yaml +++ b/Documentation/devicetree/bindings/input/input.yaml @@ -38,6 +38,5 @@ properties: Duration in seconds which the key should be kept pressed for device to reset automatically. Device with key pressed reset feature can specify this property. - $ref: /schemas/types.yaml#/definitions/uint32 additionalProperties: true |