diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 10:25:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 10:25:05 -0700 |
| commit | cd636458904a04de2349c728323c5d2af1203bdf (patch) | |
| tree | 69980d8ff803069c38d16a0d3e6932ed2a4aa5c8 /arch/s390/kernel/asm-offsets.c | |
| parent | b53c4d5eb7cda86f7bf495f52116ae43bdc9cf23 (diff) | |
| parent | 3af9256150b3ecc597c5428711f87ce105d1d58e (diff) | |
| download | linux-cd636458904a04de2349c728323c5d2af1203bdf.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull some more input subsystem updates from Dmitry Torokhov:
"An updated xpad driver with a few more recognized device IDs, and a
new psxpad-spi driver, allowing connecting Playstation 1 and 2 joypads
via SPI bus"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: cros_ec_keyb - remove extraneous 'const'
Input: add support for PlayStation 1/2 joypads connected via SPI
Input: xpad - add USB IDs for Mad Catz Brawlstick and Razer Sabertooth
Input: xpad - sync supported devices with xboxdrv
Input: xpad - sort supported devices by USB ID
Diffstat (limited to 'arch/s390/kernel/asm-offsets.c')
0 files changed, 0 insertions, 0 deletions