Skip to content
Commit 047dff63 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus 

Conflicts:
	drivers/hid/Kconfig
parents 72c16d9a b42065f3 89759e20
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