From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 15 Mar 2016 23:54:45 +0000 (-0700)
Subject: Merge tag 'v4.5' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=245f0db0de926601353776085e6f6a4c974c5615;p=linux.git

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.
---

245f0db0de926601353776085e6f6a4c974c5615
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 7a1bf68a70faa,72e2c5a2b3278..656f3dd31f199
--- a/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.