Merge branch 'for-4.15/use-timer-setup' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:13:23 +0000 (11:13 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:13:23 +0000 (11:13 +0100)
commit4b545304947147bd4b9890160d328780c97bac33
tree075de84738df9ec472980887830f632c7b6ca6df
parent6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23
parent0ee32774aed648854a06bc3fae636f20f5f75a68
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 <jkosina@suse.cz>
drivers/hid/hid-multitouch.c
drivers/hid/usbhid/hid-core.c