Merge branch 'for-4.16/elo' into for-linus

Pull hid-elo device detection fix