Merge remote-tracking branch 'input-mt/for-next'

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

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/input/misc/uinput.c
Simple merge

diff --cc drivers/input/tablet/wacom_wac.c
Simple merge

diff --cc drivers/input/touchscreen/edt-ft5x06.c
Simple merge