Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
drivers
hid
Makefile
Find file
Blame
History
Permalink
Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus
· 36dbe2fc
Jiri Kosina
authored
May 19, 2010
Conflicts: drivers/hid/Makefile
36dbe2fc