From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 15 Nov 2017 10:13:23 +0000 (+0100)
Subject: Merge branch 'for-4.15/use-timer-setup' into for-linus
X-Git-Tag: v4.15-rc1~114^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4b545304947147bd4b9890160d328780c97bac33;p=users%2Fwilly%2Flinux.git

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>
---

4b545304947147bd4b9890160d328780c97bac33