diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-23 11:04:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-23 11:04:26 -0700 |
| commit | f9d1e7f389b3724ee7d6dde7427b10806bc66577 (patch) | |
| tree | 70290718aa65445c9d6749d6862709d4e48ecf0f | |
| parent | 09502d9fffd84d22dd1fba9fd4cf0d880a5da377 (diff) | |
| parent | dcc7597116c6713353522eb13c765063ff88bb89 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Just minor driver fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: twl4030-vibra - do not reparent to grandparent
Input: twl6040-vibra - do not reparent to grandparent
Input: twl6040-vibra - ignore return value of schedule_work
Input: twl6040-vibra - fix NULL pointer dereference by removing workqueue
Input: pmic8xxx-pwrkey - fix algorithm for converting trigger delay
Input: arizona-haptic - don't assign input_dev parent
Input: clarify we want BTN_TOOL_<name> on proximity
Input: xpad - add Mad Catz FightStick TE 2 VID/PID
Input: gtco - fix crash on detecting device without endpoints