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)
commitc114dc5e5bb3e6b7cf72005ea2fc0a54097cab19
tree6c7ec7cea037f66b9beea02636b02aba7c0e9164
parentb62f97634aa9f61efb8e0935658c758140680c84
parent7c7da40da1640ce6814dab1e8031b44e19e5a3f6
Merge branch 'for-linus' into next

Sync up with 'for-linus' branch to avoid merge conflicts with following
patches to Elan touchpad drivers.