git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ed7a70 0ee3277)
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)
- usbhid: conversion to timer_setup() and from_timer() from Kees Cook

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1  2 
drivers/hid/hid-multitouch.c patch | diff1 | diff2 | blob | history
drivers/hid/usbhid/hid-core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/hid-multitouch.c
Simple merge
diff --cc drivers/hid/usbhid/hid-core.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.