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

Merge branch 'for-linus' into next 

Merge for-linus branch to sync Elan touchscreen driver code.
parents 04e49867 d34fced4
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