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
此差异已折叠。
drivers/hid/hid-roccat-kone.c
0 → 100644
此差异已折叠。
drivers/hid/hid-roccat-kone.h
0 → 100644
想要评论请 注册 或 登录