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

Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
parents db583168 adb91aef 078328da 3685c18e
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