diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2023-06-13 00:20:40 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2023-06-13 00:23:33 +0300 |
| commit | 03c601927b673a243c9595e1ecc9e8adfdd02438 (patch) | |
| tree | 9ef1868a308ed0a30deae355bfb298d7b11d6d73 /Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml | |
| parent | 1b90e8f8879c64d4f77dd1f25134397ac075b7bd (diff) | |
| parent | ba57b9b11f78530146f02b776854b2b6b6d344a4 (diff) | |
| download | linux-03c601927b673a243c9595e1ecc9e8adfdd02438.tar.xz | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/drm/drm into msm-next-lumag-base
Merge the drm-next tree to pick up the DRM DSC helpers (merged via
drm-intel-next tree). MSM DSC v1.2 patches depend on these helpers.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Diffstat (limited to 'Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml index febee8129aa9..c5403e149080 100644 --- a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml +++ b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml @@ -10,7 +10,7 @@ maintainers: - Heiko Stuebner <heiko@sntech.de> allOf: - - $ref: "nvmem.yaml#" + - $ref: nvmem.yaml# properties: compatible: |