diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-09 18:06:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-09 18:06:13 -0700 |
commit | e93df634aac6b6dccaa2c23a5a5a504ed502b97e (patch) | |
tree | 1727618cb4e5c7b70658448e252b4b58b8730dc0 /drivers/net/can/dev.c | |
parent | 068c65c557b5470eb7458cc5d507211eddc97e7d (diff) | |
parent | 4eb8d6e7e5aa14572bc389e554aad9869188cdcd (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Miscellaneous driver fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - disable "palm detection" in the focaltech driver
Input: psmouse - disable changing resolution/rate/scale for FocalTech
Input: psmouse - ensure that focaltech reports consistent coordinates
Input: psmouse - remove hardcoded touchpad size from the focaltech driver
Input: tc3589x-keypad - set IRQF_ONESHOT flag to ensure IRQ request
Input: ALPS - fix memory leak when detection fails
Input: sun4i-ts - add thermal driver dependency
Input: cyapa - remove superfluous type check in cyapa_gen5_read_idac_data()
Input: cyapa - fix unaligned functions redefinition error
Input: mma8450 - add parent device
Diffstat (limited to 'drivers/net/can/dev.c')
0 files changed, 0 insertions, 0 deletions