Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
drivers
hid
hid-input.c
Find file
Blame
History
Permalink
Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus
· 08ec2dcc
Jiri Kosina
authored
Jul 04, 2013
Conflicts: drivers/hid/hid-core.c
08ec2dcc