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

Merge branch 'for-linus' into next 

Bring in changes to ads7846 to avoid mereg conflicts.
parents 037db524 0a0d6285
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment