From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Oct 2015 00:39:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: firefly_0821_release~176^2~907
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16c8b9cb246474ba4522182fc0d24caddcbba0dd;p=firefly-linux-kernel-4.4.55.git

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

Pull input fixes from Dmitry Torokhov:
 "Just two small fixups to ads7846 touchscreen controller driver and
  Cypress touchpad driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: cyapa - fix the copy paste error on electrodes_rx value
  Input: ads7846 - correct the value got from SPI
---

16c8b9cb246474ba4522182fc0d24caddcbba0dd