Documentation/devicetree/bindings/vendor-prefixes.txt.rej

   1 --- Documentation/devicetree/bindings/vendor-prefixes.txt
   2 +++ Documentation/devicetree/bindings/vendor-prefixes.txt
   3 @@ -395,6 +397,7 @@ vot Vision Optical Technology Co., Ltd.
   4  wd     Western Digital Corp.
   5  wetek  WeTek Electronics, limited.
   6  wexler Wexler
   7 +wi2wi  Wi2Wi, Inc.
   8  winbond Winbond Electronics corp.
   9  winstar        Winstar Display Corp.
  10  wlf    Wolfson Microelectronics