commit | 4b545304947147bd4b9890160d328780c97bac33 | [log] [tgz] |
---|---|---|
author | Jiri Kosina <jkosina@suse.cz> | Wed Nov 15 11:13:23 2017 +0100 |
committer | Jiri Kosina <jkosina@suse.cz> | Wed Nov 15 11:13:23 2017 +0100 |
tree | 075de84738df9ec472980887830f632c7b6ca6df | |
parent | 6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23 [diff] | |
parent | 0ee32774aed648854a06bc3fae636f20f5f75a68 [diff] |
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>