Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
Conflicts: drivers/hid/Kconfig
Showing
drivers/bluetooth/ath3k.c
0 → 100644
drivers/hid/hid-magicmouse.c
0 → 100644
想要评论请 注册 或 登录