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

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index cc15e9911dc8f182ab8b941a1397e4b89737119b,4d95a9ddecdfbcd95bc4bd54bc7d213c8f929b6f..147e3ebe314072c26960feb014df72d00650eb16
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -3,8 -3,8 +3,8 @@@ Device tree binding vendor prefix regis
  This isn't an exhaustive list, but you should add new prefixes to it before
  using them to avoid name-space collisions.
  
- abilis        Abilis Systems
  abcn  Abracon Corporation
+ abilis        Abilis Systems
  active-semi   Active-Semi International Inc
  ad    Avionic Design GmbH
  adapteva      Adapteva, Inc.
@@@ -98,12 -98,11 +98,12 @@@ ezchip     EZchip Semiconducto
  fcs   Fairchild Semiconductor
  firefly       Firefly
  focaltech     FocalTech Systems Co.,Ltd
 +friendlyarm   Guangzhou FriendlyARM Computer Tech Co., Ltd
  fsl   Freescale Semiconductor
  ge    General Electric Company
  geekbuying    GeekBuying
- GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+ GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  geniatech     Geniatech, Inc.
  giantplus     Giantplus Technology Co., Ltd.
  globalscale   Globalscale Technologies, Inc.
@@@ -127,7 -126,6 +127,6 @@@ i2se       I2SE Gmb
  ibm   International Business Machines (IBM)
  idt   Integrated Device Technologies, Inc.
  ifi   Ingenieurburo Fur Ic-Technologie (I/F/I)
- iom   Iomega Corporation
  img   Imagination Technologies Ltd.
  infineon Infineon Technologies
  inforce       Inforce Computing
@@@ -136,10 -134,11 +135,12 @@@ 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.
+ jdi   Japan Display Inc.
  jedec JEDEC Solid State Technology Association
  karo  Ka-Ro electronics GmbH
  keymile       Keymile GmbH
@@@ -151,8 -150,8 +152,8 @@@ lantiq     Lantiq Semiconducto
  lenovo        Lenovo Group Ltd.
  lg    LG Corporation
  linux Linux-specific binding
- lsi   LSI Corp. (LSI Logic)
  lltc  Linear Technology Corporation
+ lsi   LSI Corp. (LSI Logic)
  marvell       Marvell Technology Group Ltd.
  maxim Maxim Integrated Products
  meas  Measurement Specialties
@@@ -192,20 -191,20 +193,20 @@@ onnn    ON Semiconductor Corp
  ontat On Tat Industrial Company
  opencores     OpenCores.org
  option        Option NV
+ ORCL  Oracle Corporation
  ortustech     Ortus Technology Co., Ltd.
  ovti  OmniVision Technologies
- ORCL  Oracle Corporation
  oxsemi        Oxford Semiconductor, Ltd.
  panasonic     Panasonic Corporation
  parade        Parade Technologies Inc.
  pericom       Pericom Technology Inc.
  phytec        PHYTEC Messtechnik GmbH
  picochip      Picochip Ltd
+ pixcir  PIXCIR MICROELECTRONICS Co., Ltd
  plathome      Plat'Home Co., Ltd.
  plda  PLDA
- pixcir  PIXCIR MICROELECTRONICS Co., Ltd
- pulsedlight   PulsedLight, Inc
  powervr       PowerVR (deprecated, use img)
+ pulsedlight   PulsedLight, Inc
  qca   Qualcomm Atheros, Inc.
  qcom  Qualcomm Technologies, Inc
  qemu  QEMU, a generic and open source machine emulator and virtualizer
@@@ -233,12 -232,12 +234,12 @@@ sgx     SGX Sensortec
  sharp Sharp Corporation
  si-en Si-En Technology Ltd.
  sigma Sigma Designs, Inc.
+ sii   Seiko Instruments, Inc.
  sil   Silicon Image
  silabs        Silicon Laboratories
+ silergy       Silergy Corp.
  siliconmitus  Silicon Mitus, Inc.
  simtek
- sii   Seiko Instruments, Inc.
- silergy       Silergy Corp.
  sirf  SiRF Technology, Inc.
  sis   Silicon Integrated Systems Corp.
  sitronix      Sitronix Technology Corporation
@@@ -256,9 -255,11 +257,11 @@@ starry   Starry Electronic Technology (Sh
  startek       Startek
  ste   ST-Ericsson
  stericsson    ST-Ericsson
+ sunchip       Shenzhen Sunchip Technology Co., Ltd
+ SUNW  Sun Microsystems, Inc
+ swir  Sierra Wireless
  syna  Synaptics Inc.
  synology      Synology, Inc.
- SUNW  Sun Microsystems, Inc
  tbs   TBS Technologies
  tcg   Trusted Computing Group
  tcl   Toby Churchill Ltd.
@@@ -270,14 -271,14 +273,14 @@@ tlm     Trusted Logic Mobilit
  toradex       Toradex AG
  toshiba       Toshiba Corporation
  toumaz        Toumaz
- tplink        TP-LINK Technologies Co., Ltd.
  tpk   TPK U.S.A. LLC
+ tplink        TP-LINK Technologies Co., Ltd.
  tronfy        Tronfy
  tronsmart     Tronsmart
  truly Truly Semiconductors Limited
  tyan  Tyan Computer Corporation
- upisemi       uPI Semiconductor Corp.
  uniwest       United Western Technologies Corp (UniWest)
+ upisemi       uPI Semiconductor Corp.
  urt   United Radiant Technology Corporation
  usi   Universal Scientific Industrial Co., Ltd.
  v3    V3 Semiconductor
@@@ -295,7 -296,7 +298,7 @@@ x-powers   X-Power
  xes   Extreme Engineering Solutions (X-ES)
  xillybus      Xillybus Ltd.
  xlnx  Xilinx
- zyxel ZyXEL Communications Corp.
  zarlink       Zarlink Semiconductor
  zii   Zodiac Inflight Innovations
  zte   ZTE Corp.
+ zyxel ZyXEL Communications Corp.