Merge branch 'for-dmitry/logitech-g920-merge-base' into for-4.5/logitech
authorJiri Kosina <jkosina@suse.cz>
Fri, 20 Nov 2015 09:28:40 +0000 (10:28 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 20 Nov 2015 09:28:40 +0000 (10:28 +0100)
commit2f23985879c2fb2967e8bca77b1014b437a9b9ff
tree429f6914125df178d941c5f6c5a23beddeb6ed70
parent319645cac26c2d065a485f5d59228433ad602f71
parent27b9d5a254dcbc6095404c1bab7c335419601eb8
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>
drivers/input/joystick/xpad.c