Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus
Conflicts: drivers/hid/hid-core.c
Showing
drivers/hid/hid-huion.c
0 → 100644
drivers/hid/hid-ps3remote.c
已删除
100644 → 0
想要评论请 注册 或 登录