diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 20:10:00 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 20:10:00 +0200 |
| commit | f4c3c7a8ab9226af448d66103dfddf387711af9d (patch) | |
| tree | fe668c86a171420067eefe2b30ab4ca764ebd4c8 /0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | |
| parent | d2c10672fc73b0484b5bd441c7a43087a20cfc61 (diff) | |
| parent | 4459220aecb835a73131f0de65f5d9b4200a8efc (diff) | |
| download | kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.tar.gz kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.tar.xz kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc31
Diffstat (limited to '0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch')
| -rw-r--r-- | 0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch b/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch index f212fb501..ac6698252 100644 --- a/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch +++ b/0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch @@ -12,10 +12,10 @@ Reviewed-by: Rob Herring <robh@kernel.org> 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml -index 715586dea9bb..fff0439c6b78 100644 +index d4a4045092df..ed808148b6a7 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml -@@ -420,6 +420,11 @@ properties: +@@ -425,6 +425,11 @@ properties: - const: pine64,rockpro64 - const: rockchip,rk3399 |