From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Aug 2015 07:38:42 +0000 (+0200)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~6123
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a230e95cc66a5a27e53459187ffcedb65b2782c3;p=mirror_ubuntu-zesty-kernel.git

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

Pull input subsystem fixes from Dmitry Torokhov:
 "Just small ALPS and Elan touchpads, and other driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elantech - add special check for fw_version 0x470f01 touchpad
  Input: twl4030-vibra - fix ERROR: Bad of_node_put() warning
  Input: alps - only Dell laptops have separate button bits for v2 dualpoint sticks
  Input: axp20x-pek - add module alias
  Input: turbografx - fix potential out of bound access
---

a230e95cc66a5a27e53459187ffcedb65b2782c3