diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-07-22 08:17:27 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-07-22 08:17:27 +0300 |
| commit | a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e (patch) | |
| tree | 7f46722dcd4bdce411612d9ccb83651795dad5e3 /drivers/pcmcia | |
| parent | 9b031c86506cef9acae45e61339fcf9deaabb793 (diff) | |
| parent | a50ca29523b18baea548bdf5df9b4b923c2bb4f6 (diff) | |
| download | linux-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.tar.xz | |
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions