Merge tag 'v3.19-rc4' into next

Merge with mainline to bring in the latest thermal and other changes.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 9f18b4f,b1df0ad..38c13dc
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -48,9 -54,10 +54,11 @@@ epcos       EPCOS A
  epfl  Ecole Polytechnique Fédérale de Lausanne
  epson Seiko Epson Corp.
  est   ESTeem Wireless Modems
 +ettus NI Ettus Research
  eukrea  Eukréa Electromatique
+ everest       Everest Semiconductor Co. Ltd.
  excito        Excito
+ fcs   Fairchild Semiconductor
  fsl   Freescale Semiconductor
  GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/input/keyboard/imx_keypad.c
Simple merge

diff --cc drivers/input/mouse/alps.c
Simple merge

diff --cc drivers/input/mouse/psmouse-base.c
Simple merge

diff --cc drivers/input/mouse/synaptics.c
Simple merge