Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull more input updates from Dmitry Torokhov:
 "Two new drivers for touchscreen controllers:

   - Silead touchscreen controllers
   - SiS 9200 family touchscreen controllers

  and a few driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: silead - remove some dead code
  Input: sis-i2c - select CONFIG_CRC_ITU_T
  Input: add driver for SiS 9200 family I2C touchscreen controllers
  Input: ili210x - fix permissions on "calibrate" attribute
  Input: elan_i2c - properly wake up touchpad on ASUS laptops
  Input: add driver for Silead touchscreens
  Input: elantech - fix debug dump of the current packet
  Input: rotary_encoder - support binary encoding of states
  Input: xpad - power off wireless 360 controllers on suspend
  Input: i8042 - break load dependency between atkbd/psmouse and i8042
  Input: synaptics-rmi4 - do not check for NULL when calling of_node_put()
  Input: cros_ec_keyb - cleanup use of dev

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index 68391a462c0a52c8b96d66edc55b863af8e7d974,99029cfed45932918a1c710b192996f22fb6769f..1992aa97d45ac8b0a9cfaefbaf5de40780c601ad
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -16,23 -16,19 +16,23 @@@ al Annapurna Lab
  allwinner     Allwinner Technology Co., Ltd.
  alphascale    AlphaScale Integrated Circuits Systems, Inc.
  altr  Altera Corp.
 +amazon        Amazon.com, Inc.
  amcc  Applied Micro Circuits Corporation (APM, formally AMCC)
  amd   Advanced Micro Devices (AMD), Inc.
  amlogic       Amlogic, Inc.
  ampire        Ampire Co., Ltd.
  ams   AMS AG
  amstaos       AMS-Taos Inc.
 +analogix      Analogix Semiconductor, Inc.
  apm   Applied Micro Circuits Corporation (APM)
  aptina        Aptina Imaging
  arasan        Arasan Chip Systems
  arm   ARM Ltd.
  armadeus      ARMadeus Systems SARL
 +arrow Arrow Electronics
  artesyn       Artesyn Embedded Technologies Inc.
  asahi-kasei   Asahi Kasei Corp.
 +aspeed        ASPEED Technology Inc.
  atlas Atlas Scientific LLC
  atmel Atmel Corporation
  auo   AU Optronics Corporation
@@@ -62,7 -58,6 +62,7 @@@ cnxt  Conexant Systems, Inc
  compulab      CompuLab Ltd.
  cortina       Cortina Systems, Inc.
  cosmic        Cosmic Circuits
 +creative      Creative Technology Ltd
  crystalfontz  Crystalfontz America, Inc.
  cubietech     Cubietech, Ltd.
  cypress       Cypress Semiconductor Corporation
@@@ -75,14 -70,11 +75,14 @@@ digilent   Diglent, Inc
  dlg   Dialog Semiconductor
  dlink D-Link Corporation
  dmo   Data Modul AG
 +dptechnics    DPTechnics
 +dragino       Dragino Technology Co., Limited
  ea    Embedded Artists AB
  ebv   EBV Elektronik
  edt   Emerging Display Technologies
  eeti  eGalax_eMPIA Technology Inc
  elan  Elan Microelectronic Corp.
 +embest        Shenzhen Embest Technology Co., Ltd.
  emmicro       EM Microelectronic
  energymicro   Silicon Laboratories (formerly Energy Micro AS)
  epcos EPCOS AG
@@@ -94,13 -86,11 +94,13 @@@ eukrea  Eukréa Electromatiqu
  everest       Everest Semiconductor Co. Ltd.
  everspin      Everspin Technologies, Inc.
  excito        Excito
 +ezchip        EZchip Semiconductor
  fcs   Fairchild Semiconductor
  firefly       Firefly
  focaltech     FocalTech Systems 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.
  geniatech     Geniatech, Inc.
@@@ -128,8 -118,6 +128,8 @@@ 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
  ingenic       Ingenic Semiconductor
  innolux       Innolux Corporation
  intel Intel Corporation
@@@ -153,7 -141,6 +153,7 @@@ lsi        LSI Corp. (LSI Logic
  lltc  Linear Technology Corporation
  marvell       Marvell Technology Group Ltd.
  maxim Maxim Integrated Products
 +meas  Measurement Specialties
  mediatek      MediaTek Inc.
  melexis       Melexis N.V.
  merrii        Merrii Technology Co., Ltd.
@@@ -165,7 -152,6 +165,7 @@@ mitsubishi Mitsubishi Electric Corporat
  mosaixtech    Mosaix Technologies, Inc.
  moxa  Moxa
  mpl   MPL AG
 +mqmaker       mqmaker Inc.
  msi   Micro-Star International Co. Ltd.
  mti   Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
  mundoreader   Mundo Reader S.L.
@@@ -185,15 -171,12 +185,15 @@@ nvidia  NVIDI
  nxp   NXP Semiconductors
  okaya Okaya Electric America, Inc.
  olimex        OLIMEX Ltd.
 +onion Onion Corporation
  onnn  ON Semiconductor Corp.
 +ontat On Tat Industrial Company
  opencores     OpenCores.org
  option        Option NV
  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.
@@@ -238,6 -221,7 +238,7 @@@ simte
  sii   Seiko Instruments, Inc.
  silergy       Silergy Corp.
  sirf  SiRF Technology, Inc.
+ sis   Silicon Integrated Systems Corp.
  sitronix      Sitronix Technology Corporation
  skyworks      Skyworks Solutions, Inc.
  smsc  Standard Microsystems Corporation
@@@ -249,7 -233,6 +250,7 @@@ sony       Sony Corporatio
  spansion      Spansion Inc.
  sprd  Spreadtrum Communications Inc.
  st    STMicroelectronics
 +starry        Starry Electronic Technology (ShenZhen) Co., LTD
  startek       Startek
  ste   ST-Ericsson
  stericsson    ST-Ericsson
@@@ -257,9 -240,7 +258,9 @@@ syna       Synaptics Inc
  synology      Synology, Inc.
  SUNW  Sun Microsystems, Inc
  tbs   TBS Technologies
 +tcg   Trusted Computing Group
  tcl   Toby Churchill Ltd.
 +technexion    TechNexion
  technologic   Technologic Systems
  thine THine Electronics, Inc.
  ti    Texas Instruments
@@@ -268,13 -249,10 +269,13 @@@ toradex Toradex A
  toshiba       Toshiba Corporation
  toumaz        Toumaz
  tplink        TP-LINK Technologies Co., Ltd.
 +tpk   TPK U.S.A. LLC
  tronfy        Tronfy
  tronsmart     Tronsmart
  truly Truly Semiconductors Limited
 +tyan  Tyan Computer Corporation
  upisemi       uPI Semiconductor Corp.
 +uniwest       United Western Technologies Corp (UniWest)
  urt   United Radiant Technology Corporation
  usi   Universal Scientific Industrial Co., Ltd.
  v3    V3 Semiconductor
@@@ -283,7 -261,6 +284,7 @@@ via        VIA Technologies, Inc
  virtio        Virtual I/O Device Specification, developed by the OASIS consortium
  vivante       Vivante Corporation
  voipac        Voipac Technologies s.r.o.
 +wd    Western Digital Corp.
  wexler        Wexler
  winbond Winbond Electronics corp.
  wlf   Wolfson Microelectronics