Skip to content
Commit 72c16d9a authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus 

Conflicts:
	drivers/hid/hid-multitouch.c
parents 4f5a8104 fb4d8d98
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