Merge remote-tracking branch 'hid/for-next'

Conflicts:
	drivers/hid/hid-multitouch.c

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-multitouch.c
index 82e9211b3ca97cfec8f316d33870f22f6fac0617,aceaf6c08878f41d82b355df1651bc4aeeb72010..e193ba85f5c0dbbc0d548a60b535a978e2a7d503
--- 1/drivers/hid/hid-multitouch.c
--- 2/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@@ -680,11 -723,7 +727,7 @@@ static void mt_process_mt_event(struct 
                if (usage->usage_index + 1 == field->report_count) {
                        /* we only take into account the last report. */
                        if (usage->hid == td->last_slot_field)
 -                              mt_complete_slot(td, field->hidinput->input);
 +                              mt_complete_slot(td, input);
- 
-                       if (field->index == td->last_field_index
-                               && td->num_received >= td->num_expected)
-                               mt_sync_frame(td, field->hidinput->input);
                }
  
        }