Merge tag 'v3.19-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 15 Jan 2015 17:46:14 +0000 (09:46 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 15 Jan 2015 17:46:14 +0000 (09:46 -0800)
commit0c49cd295d42d0032af11d55e2140dbec11dc8d0
tree1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58
parent0c3e99437a66e4c869c60c2398449e6d98f3a988
parenteaa27f34e91a14cdceed26ed6c6793ec1d186115
Merge tag 'v3.19-rc4' into next

Merge with mainline to bring in the latest thermal and other changes.
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
drivers/input/evdev.c
drivers/input/keyboard/imx_keypad.c
drivers/input/mouse/alps.c
drivers/input/mouse/psmouse-base.c
drivers/input/mouse/synaptics.c