Merge branch 'for-4.14/ish' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:10:13 +0000 (11:10 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:10:13 +0000 (11:10 +0200)
commitd29ed11bb728bbe5175d1e9ff592140150305ab6
treeaea23d2252e66f5db1a0dcf99c664b88b9943a03
parent2682b892368bf304e7ecddd9ac68045db516a009
parent0be2bfdc2307bfe49d7dae5a18f021affc1276b7
Merge branch 'for-4.14/ish' into for-linus

- bring consistency into logical minimum numbering in sensor-hub
  driver, from Srinivas Pandruvada
drivers/hid/hid-sensor-custom.c