Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Oct 2016 04:25:09 +0000 (21:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Oct 2016 04:25:09 +0000 (21:25 -0700)
Pull input fix from Dmitry Torokhov:
 "One small change to make joydev (which is used by older games) to bind
  to devices that export Z axis but not X or Y (such as TRC rudder)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: joydev - recognize devices with Z axis as joysticks


Trivial merge