diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-10 23:14:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-10 23:14:23 +0100 |
| commit | 60cfc98b242cd89f6d9ec69ca40c38e8d1d80ed8 (patch) | |
| tree | ba67c7bd1f06d58746b94bb729924a148e953a99 /drivers/block/ps3vram.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3 (diff) | |
| download | linux-60cfc98b242cd89f6d9ec69ca40c38e8d1d80ed8.tar.xz linux-60cfc98b242cd89f6d9ec69ca40c38e8d1d80ed8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer updates from Dmitry Torokhov:
- a new ACPI ID for Elan touchpad found in yet another Ideapad model
- Synaptics RMI4 will allow binding to controllers reporting SMB
version 3 (note that we are not adding any new ACPI IDs to the
Synaptics PS/2 drover so unless user explicitly enables intertouch
support there is no user-visible change)
- a fixup to TSC 2004/5 touchscreen driver to mark input devices as
"direct" to help userspace identify the type of device they are
dealing with
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3
Input: tsc200x-core - set INPUT_PROP_DIRECT
Input: elan_i2c - add ELAN060C to the ACPI table
Diffstat (limited to 'drivers/block/ps3vram.c')
0 files changed, 0 insertions, 0 deletions