| commit | a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Tue Jul 21 22:17:27 2020 -0700 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Tue Jul 21 22:17:27 2020 -0700 |
| tree | 7f46722dcd4bdce411612d9ccb83651795dad5e3 | |
| parent | 9b031c86506cef9acae45e61339fcf9deaabb793 [diff] | |
| parent | a50ca29523b18baea548bdf5df9b4b923c2bb4f6 [diff] |
Merge branch 'for-linus' into next Sync up with 'for-linus' branch to resolve conflict in Elan touchpad driver.