Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus
Conflicts: drivers/hid/hid-ids.h drivers/hid/hid-sony.c drivers/hid/i2c-hid/i2c-hid.c
Showing
drivers/hid/hid-cp2112.c
0 → 100644
此差异已折叠。
想要评论请 注册 或 登录