Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus
Conflicts: drivers/hid/Makefile
Showing
drivers/hid/hid-picolcd.c
0 → 100644
drivers/hid/hid-prodikeys.c
0 → 100644
Please register or sign in to comment