From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 01:48:16 +0000 (+1000)
Subject: Merge remote-tracking branch 'devicetree/for-next'
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=ac4f3c1cf1df278cfa390c3866d0a766add67bb9

Merge remote-tracking branch 'devicetree/for-next'
---

ac4f3c1cf1df278cfa390c3866d0a766add67bb9
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index cc15e9911dc8,4d95a9ddecdf..147e3ebe3140
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -136,7 -134,7 +135,8 @@@ innolux	Innolux Corporatio
  intel	Intel Corporation
  intercontrol	Inter Control Group
  invensense	InvenSense Inc.
 +inversepath	Inverse Path
+ iom	Iomega Corporation
  isee	ISEE 2007 S.L.
  isil	Intersil
  issi	Integrated Silicon Solutions Inc.