diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-04 11:37:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-04 11:37:42 -0700 |
| commit | e00811b4ca520e5a876baf41c6831de4bc276d3e (patch) | |
| tree | 94318a04adb05210f0bb076f765611db8c17a512 /drivers/scsi/bvme6000_scsi.c | |
| parent | 9f03b2c7c576bbc427b4c214b2c548f3539b17a2 (diff) | |
| parent | 0fd5f221093870d93edb696f6903b058c4d75411 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
- a couple of regression fixes in synaptics and axp20x-pek drivers
- try to ease transition from PS/2 to RMI for Synaptics touchpad users
by ensuring we do not try to activate RMI mode when RMI SMBus support
is not enabled, and nag users a bit to enable it
- plus a couple of other changes that seemed worthwhile for this
release
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: axp20x-pek - switch to acpi_dev_present and check for ACPI0011 too
Input: axp20x-pek - only check for "INTCFD9" ACPI device on Cherry Trail
Input: tm2-touchkey - use LEN_ON as boolean value instead of LED_FULL
Input: synaptics - tell users to report when they should be using rmi-smbus
Input: synaptics - warn the users when there is a better mode
Input: synaptics - keep PS/2 around when RMI4_SMB is not enabled
Input: synaptics - clear device info before filling in
Input: silead - disable interrupt during suspend
Diffstat (limited to 'drivers/scsi/bvme6000_scsi.c')
0 files changed, 0 insertions, 0 deletions