diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-03 22:05:15 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-03 22:05:15 +0000 |
| commit | fe70da5a325c1ac860d463ca802dae6a8bb05e21 (patch) | |
| tree | b4ca9605efad87494e82ed5fdf5648d01d6f5baa /drivers/edac/e7xxx_edac.c | |
| parent | d4e9056daedca3891414fe3c91de3449a5dad0f2 (diff) | |
| parent | b19efcabb587e5470a423ef778905f47e5a47f1a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
- a driver for SGI IOC3 PS/2 controller
- updates to driver for FocalTech FT5x06 series touch screen
controllers
- other assorted fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - switch to reduced reporting mode
dt-bindings: touchscreen: Convert Goodix touchscreen to json-schema
dt-bindings: touchscreen: Add touchscreen schema
Input: add IOC3 serio driver
Input: axp20x-pek - enable wakeup for all AXP variants
Input: axp20x-pek - respect userspace wakeup configuration
Input: ads7846 - use new `delay` structure for SPI transfer delays
Input: edt-ft5x06 - use pm core to enable/disable the wake irq
Input: edt-ft5x06 - make wakeup-source switchable
Input: edt-ft5x06 - document wakeup-source capability
Input: edt-ft5x06 - alphabetical include reorder
Input: edt-ft5x06 - work around first register access error
Input: apbps2 - add __iomem to register struct
Input: axp20x-pek - make device attributes static
Input: elants_i2c - check Remark ID when attempting firmware update
Diffstat (limited to 'drivers/edac/e7xxx_edac.c')
0 files changed, 0 insertions, 0 deletions