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

Merge branch 'next' into for-linus 

Conflicts:
	drivers/input/tablet/wacom_sys.c
parents 10ce3cc9 131c713f
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