diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-14 22:53:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-14 22:53:37 -0700 |
commit | 0ffff118b16b1201801d002ff9fa2eecdb45c529 (patch) | |
tree | 03f9b2c230e5a345f74a62949262702ddc52e9f0 /drivers/scsi/scsi_trace.c | |
parent | dcf903d0c9adf003f664446bfc392034272b3071 (diff) | |
parent | dda5202b001cb59b16a1d20d063edd71e12905b3 (diff) | |
download | linux-0ffff118b16b1201801d002ff9fa2eecdb45c529.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull a few more input updates from Dmitry Torokhov:
- multi-touch handling for Xen
- fix for long-standing bug causing crashes in i8042 on boot
- change to gpio_keys to better handle key presses during system state
transition
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - fix crash at boot time
Input: gpio_keys - handle the missing key press event in resume phase
Input: xen-kbdfront - add multi-touch support
Diffstat (limited to 'drivers/scsi/scsi_trace.c')
0 files changed, 0 insertions, 0 deletions