Merge tag 'v4.11-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 3 Apr 2017 19:01:20 +0000 (12:01 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 3 Apr 2017 19:01:20 +0000 (12:01 -0700)
commit03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8
treecd89bdd4053e46ff3cbd67adeffa24310c04e725
parent96083b2e90cddfb688e70630a1dbfdfe5fb0262d
parenta71c9a1c779f2499fb2afc0553e543f18aff6edf
Merge tag 'v4.11-rc5' into next

Sync up with mainline to bring in changes to input subsystem merged
through other trees.
drivers/input/mouse/alps.c
drivers/input/mouse/alps.h
include/linux/mfd/cros_ec_commands.h