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)
commite2d39e0f95cb414b1fb6530f8429ad411586922b
tree58ebf7762babc6fd8fd443fde9002cc7aa89202f
parent108ff0e8012ae10708168940c7474318fb343751
parent2ddc8e2d2b5902b376fee51585c8eed72b8836e7
Merge branch 'for-4.17/upstream' into for-linus

Pull a few small generic code cleanups.
drivers/hid/hid-asus.c
drivers/hid/hid-core.c
drivers/hid/hid-multitouch.c
include/linux/hid.h