Merge branch 'for-4.20/i2c-hid' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 23 Oct 2018 11:34:28 +0000 (13:34 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 23 Oct 2018 11:34:28 +0000 (13:34 +0200)
- general cleanups of hid-i2c driver
- SPIODEV device descriptor fixes

1  2 
drivers/hid/i2c-hid/i2c-hid-core.c
drivers/hid/intel-ish-hid/ipc/pci-ish.c

Simple merge