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

Merge branch 'multitouch' into for-linus 

Conflicts:
	drivers/hid/hid-multitouch.c
parents a3cbe10e f5ff4e1e
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