tree eb390def1c4155cdb9158c6c36281b8f18d3f2d0
parent ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc
parent 029b18361921a0a07b17bd89a2cf20df3d115de8
author Linus Torvalds <torvalds@linux-foundation.org> 1421600123 +1200
committer Linus Torvalds <torvalds@linux-foundation.org> 1421600123 +1200

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input subsystem fixes from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION
  Input: I8042 - add Acer Aspire 7738 to the nomux list
  Input: elantech - support new ICs types for version 4
  Input: i8042 - reset keyboard to fix Elantech touchpad detection
  MAINTAINERS: remove Dmitry Torokhov's alternate address