Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Oct 2017 20:19:12 +0000 (16:19 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Oct 2017 20:19:12 +0000 (16:19 -0400)
Pull input fix from Dmitry Torokhov:
 "A fix for a broken commit in the previous pull breaking automatic
  module loading of input handlers, such ad evdev"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: do not use property bits when generating module alias


Trivial merge