Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 28 May 2019 01:48:01 +0000 (18:48 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 28 May 2019 01:48:01 +0000 (18:48 -0700)
Sync up with 'for-linus' branch to avoid merge conflicts with following
patches to Elan touchpad drivers.


Trivial merge