Merge branch 'for-4.17/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:28:46 +0000 (13:28 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:28:46 +0000 (13:28 +0200)
Pull a few small generic code cleanups.

1  2 
drivers/hid/hid-asus.c
drivers/hid/hid-core.c
drivers/hid/hid-multitouch.c
include/linux/hid.h

Simple merge
Simple merge
Simple merge
Simple merge