Merge branch 'for-4.15/use-timer-setup' into for-linus

- usbhid: conversion to timer_setup() and from_timer() from Kees Cook

Signed-off-by: Jiri Kosina <[email protected]>

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

diff --cc drivers/hid/usbhid/hid-core.c
Simple merge