Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c114dc5e authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'for-linus' into next 

Sync up with 'for-linus' branch to avoid merge conflicts with following
patches to Elan touchpad drivers.
parents b62f9763 7c7da40d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment