From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Sep 2014 00:26:12 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v3.17-rc4~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=44bf091f508913c1c35e70ea96430454c95c78f1;p=users%2Fwilly%2Fxarray.git

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

Pull input subsystem updates from Dmitry Torokhov:
 "A fix for MT breakage, enhancement to Elantech PS/2 driver and a
  couple of assorted fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elantech - add support for trackpoint found on some v3 models
  Input: elantech - reset the device when elantech probe fails
  Input: ALPS - suppress message about 'Unknown touchpad'
  Input: fix used slots detection breakage
  Input: sparc - i8042-sparcio.h: fix unused kbd_res warning
  Input: atmel_mxt_ts - improve description of gpio-keymap property
---

44bf091f508913c1c35e70ea96430454c95c78f1