Merge branch 'for-linus' into next

Sync up with 'for-linus' branch to avoid merge conflicts with following
patches to Elan touchpad drivers.
This commit is contained in:
Dmitry Torokhov 2019-05-27 18:48:01 -07:00
commit c114dc5e5b
4 changed files with 25 additions and 2 deletions