Skip to content
GitLab
Explore
Sign in
Commit
047dff63
authored
Apr 30, 2013
by
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
Changes
19
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