Skip to content
GitLab
Explore
Sign in
Commit
72c16d9a
authored
Apr 30, 2013
by
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment