Merge branch 'for-dmitry/logitech-g920-merge-base' into for-4.5/logitech

Pull the branch that has been established to be jointly merged to both hid.git
and input.git, because both trees have different depending patches on top.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --cc drivers/input/joystick/xpad.c
Simple merge