Merge tag 'v4.0-rc7' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 7 Apr 2015 15:46:23 +0000 (08:46 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 7 Apr 2015 15:46:23 +0000 (08:46 -0700)
commit5f63e885ac32429fc1340f5a61e1484022efc773
treef9a21a6902e1857274775b96d561d8be17287860
parentb6d2d3289f84e9c7449dff04fb959e29207acd80
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1
Merge tag 'v4.0-rc7' into next

Sync up with Linux 4.0-rc7 to bring in ALPS changes.
MAINTAINERS
drivers/input/mouse/synaptics.c
include/uapi/linux/input.h