diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-16 00:12:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-16 00:12:01 +0200 |
| commit | b92178623f190a9898fed3632fb40b17f6789673 (patch) | |
| tree | 6c0742d47f8ce10e3c553b948a5003253ee4524e /drivers/hid/hid-sjoy.c | |
| parent | ia64: Fix syscall number for memfd_create (diff) | |
| parent | Input: atmel_mxt_ts - fix merge in DT documentation (diff) | |
| download | linux-b92178623f190a9898fed3632fb40b17f6789673.tar.xz linux-b92178623f190a9898fed3632fb40b17f6789673.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"A few quirks for i8042/AT keyboards and a small device tree doc fix
for Atmel Touchscreens"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: atmel_mxt_ts - fix merge in DT documentation
Input: i8042 - also set the firmware id for MUXed ports
Input: i8042 - add nomux quirk for Avatar AVIU-145A6
Input: i8042 - add Fujitsu U574 to no_timeout dmi table
Input: atkbd - do not try 'deactivate' keyboard on any LG laptops
Diffstat (limited to 'drivers/hid/hid-sjoy.c')
0 files changed, 0 insertions, 0 deletions