Skip to content
Commit a5c33d5f authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'for-linus' into next 

Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.
parents 9b031c86 a50ca295
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