From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Apr 2015 21:10:08 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v4.0-rc7~2
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=9e441639d1ed78245600191f0fa45e106935a9dc;p=cascardo%2Flinux.git

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

Pull input fixes from Dmitry Torokhov:
 "Updates for the input subsystem - two more tweaks for ALPS driver to
  work out kinks after splitting the touchpad, trackstick, and potential
  external PS/2 mouse into separate input devices.

  Changes to support ALPS SS4 devices (protocol V8) will be coming in
  4.1..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: alps - document stick behavior for protocol V2
  Input: alps - report V2 Dualpoint Stick events via the right evdev node
  Input: alps - report interleaved bare PS/2 packets via dev3
---

9e441639d1ed78245600191f0fa45e106935a9dc