Skip to content
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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment