Merge tag 'v4.0-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Mar 2015 16:18:27 +0000 (09:18 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Mar 2015 16:18:27 +0000 (09:18 -0700)
commit188933ac139a6f8ab06cad369bd0200af947b00d
treec4c107528fcf6b82e32a93b0596e13eea7aa9385
parent4ed0e032c3cf27c6fabc154164d003c4e0ac4654
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6
Merge tag 'v4.0-rc5' into next

Merge with the latest upstream to synchronize Synaptics changes
and bring in new infrastructure pieces.

Conflicts:
drivers/input/mouse/synaptics.c
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/input/mouse/psmouse-base.c
drivers/input/mouse/synaptics.c
drivers/input/mouse/synaptics.h
drivers/input/touchscreen/Kconfig
include/uapi/linux/input.h