git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ff0e41 f130307)
Merge tag 'devicetree-fixes-for-4.17' into dt/next to pick-up fixes
authorRob Herring <robh@kernel.org>
Tue, 15 May 2018 00:40:20 +0000 (19:40 -0500)
committerRob Herring <robh@kernel.org>
Tue, 15 May 2018 00:44:23 +0000 (19:44 -0500)
1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index c7a703ab480c6d6fb0a1d1269e282329d76929ea,a38d8bfae19c3a7897032d1b80c83622ba92da5d..d63a218e732ba46b59e985ae6769f73a1d20b222
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/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
Unnamed repository; edit this file 'description' to name the repository.