| commit | 16c8b9cb246474ba4522182fc0d24caddcbba0dd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 16 17:39:27 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 16 17:39:27 2015 -0700 |
| tree | 8277620648d4d0655046f437b18083b86c4095ea | |
| parent | 4f3f9573b62be8953ac3d9888c253e0744af7195 [diff] | |
| parent | a487c03fa28286d0de42558da1aa57d82d54fc4d [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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