Merge tag 'v4.5' into next

Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to
fix pxa/raumfeld rotary encoder properties.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 7a1bf68,72e2c5a..656f3dd
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -218,9 -223,9 +223,10 @@@ sony      Sony Corporatio
  spansion      Spansion Inc.
  sprd  Spreadtrum Communications Inc.
  st    STMicroelectronics
+ startek       Startek
  ste   ST-Ericsson
  stericsson    ST-Ericsson
 +syna  Synaptics Inc.
  synology      Synology, Inc.
  tbs   TBS Technologies
  tcl   Toby Churchill Ltd.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-pxa/raumfeld.c
Simple merge

diff --cc arch/blackfin/mach-bf537/boards/stamp.c
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/ad7879.c
Simple merge