diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-09 10:41:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-09 10:41:53 +0300 |
| commit | 9a2dd570591ea1d53284208ab8838c0ab2a08340 (patch) | |
| tree | 19bdbaded0ca8717198067911a1a91c3d7731a3b /Documentation/devicetree/bindings/arm/arm,scmi.txt | |
| parent | 9211f0a6a91ada1ee28b3fb5f30d79c8a67c73b1 (diff) | |
| parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
| download | linux-9a2dd570591ea1d53284208ab8838c0ab2a08340.tar.xz | |
Merge 5.6-rc5 into driver-core-next
We need the driver core and debugfs changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/arm/arm,scmi.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/arm,scmi.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/arm,scmi.txt b/Documentation/devicetree/bindings/arm/arm,scmi.txt index f493d69e6194..dc102c4e4a78 100644 --- a/Documentation/devicetree/bindings/arm/arm,scmi.txt +++ b/Documentation/devicetree/bindings/arm/arm,scmi.txt @@ -102,7 +102,7 @@ Required sub-node properties: [1] Documentation/devicetree/bindings/clock/clock-bindings.txt [2] Documentation/devicetree/bindings/power/power-domain.yaml [3] Documentation/devicetree/bindings/thermal/thermal.txt -[4] Documentation/devicetree/bindings/sram/sram.txt +[4] Documentation/devicetree/bindings/sram/sram.yaml [5] Documentation/devicetree/bindings/reset/reset.txt Example: |