From: Rob Herring <robh@kernel.org>
Date: Tue, 15 May 2018 00:40:20 +0000 (-0500)
Subject: Merge tag 'devicetree-fixes-for-4.17' into dt/next to pick-up fixes
X-Git-Tag: v5.15~8679^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9601000cd57e395b56642596903f59d61d91e176;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'devicetree-fixes-for-4.17' into dt/next to pick-up fixes
---

9601000cd57e395b56642596903f59d61d91e176
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index c7a703a,a38d8bf..d63a218
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -183,9 -182,9 +183,10 @@@ karo	Ka-Ro electronics Gmb
  keithkoep	Keith & Koep GmbH
  keymile	Keymile GmbH
  khadas	Khadas
+ kiebackpeter    Kieback & Peter GmbH
  kinetic Kinetic Technologies
  kingnovel	Kingnovel Technology Co., Ltd.
 +koe	Kaohsiung Opto-Electronics Inc.
  kosagi	Sutajio Ko-Usagi PTE Ltd.
  kyo	Kyocera Corporation
  lacie	LaCie