diff options
author | Linus Torvalds | 2016-07-16 07:04:12 +0900 |
---|---|---|
committer | Linus Torvalds | 2016-07-16 07:04:12 +0900 |
commit | 631517032f261f6fd35d11321cd2ba695573f2ed (patch) | |
tree | 9314ee72e6854e6b472ae1e2fb410f2706a0bfbf /include/linux/timer.h | |
parent | 8dcf5a80dd186ae1a19357e5a32f198bee107723 (diff) | |
parent | 6a5029e66404462a3322dba8e35615bd09332081 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A few last-minute updates for the input subsystem"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle
Input: synaptics-rmi4 - use of_get_child_by_name() to fix refcount
Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE"
Input: xpad - validate USB endpoint count during probe
Input: add SW_PEN_INSERTED define
Diffstat (limited to 'include/linux/timer.h')
0 files changed, 0 insertions, 0 deletions