diff options
| author | Linus Torvalds <[email protected]> | 2017-11-04 01:10:23 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-11-04 01:10:23 +0000 |
| commit | e50f82f809243f849122e06b8119da9dc00fc765 (patch) | |
| tree | b5ba88821ad247c7b2bdaecfd6a23331ab18eb77 /drivers/iio/trigger/stm32-timer-trigger.c | |
| parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Input: sparse-keymap - send sync event for KE_SW/KE_VSW (diff) | |
| download | kernel-e50f82f809243f849122e06b8119da9dc00fc765.tar.gz kernel-e50f82f809243f849122e06b8119da9dc00fc765.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Just a couple of fixups to the sparse-keymap module and the Microchip
AR1021 touchscreen driver"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: sparse-keymap - send sync event for KE_SW/KE_VSW
Input: ar1021_i2c - set INPUT_PROP_DIRECT
Diffstat (limited to 'drivers/iio/trigger/stm32-timer-trigger.c')
0 files changed, 0 insertions, 0 deletions