Merge remote-tracking branch 'input/next'

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index b6d810c5f91f8ae94ddfb39aac626369ba798b78,728cd0e1b306452f13a136cc31d348098524c9f6..5686d401431a821616e1e1d6839ccbcd07a657c8
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -81,8 -79,8 +82,9 @@@ geniatech     Geniatech, Inc
  giantplus     Giantplus Technology Co., Ltd.
  globalscale   Globalscale Technologies, Inc.
  gmt   Global Mixed-mode Technology, Inc.
+ goodix        Shenzhen Huiding Technology Co., Ltd.
  google        Google, Inc.
 +grinn Grinn
  gumstix       Gumstix, Inc.
  gw    Gateworks Corporation
  hannstar      HannStar Display Corporation

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/hid/hid-debug.c
Simple merge

diff --cc drivers/input/input-mt.c
Simple merge

diff --cc include/uapi/linux/input.h
Simple merge