projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4f3f957 a487c03)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Oct 2015 00:39:27 +0000 (17:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Oct 2015 00:39:27 +0000 (17:39 -0700)
commit16c8b9cb246474ba4522182fc0d24caddcbba0dd
tree8277620648d4d0655046f437b18083b86c4095eatree | snapshot
parent4f3f9573b62be8953ac3d9888c253e0744af7195commit | diff
parenta487c03fa28286d0de42558da1aa57d82d54fc4dcommit | diff
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
John Crispins staging tree