Merge tag 'v4.5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 15 Mar 2016 23:54:45 +0000 (16:54 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 15 Mar 2016 23:54:45 +0000 (16:54 -0700)
commit245f0db0de926601353776085e6f6a4c974c5615
treeb493e9e726f4a898041f7861d0df328aa1a348a1
parent24672bdfb357b91bed0ea8d432241bf7bdefc8a8
parentb562e44f507e863c6792946e4e1b1449fbbac85d
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.
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm/mach-pxa/raumfeld.c
arch/blackfin/mach-bf537/boards/stamp.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/ad7879.c