Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 31 Jan 2018 15:23:58 +0000 (16:23 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 31 Jan 2018 15:23:58 +0000 (16:23 +0100)
Pull assorted small fixes queued for merge window.

1  2  3 
drivers/hid/hid-sony.c
net/bluetooth/hidp/core.c

Simple merge
Simple merge