diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-26 16:45:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-26 16:45:13 -0700 |
| commit | c86daad2c25bfd4a33d48b7691afaa96d9c5ab46 (patch) | |
| tree | 5bd19f795dc87897173918d41ed2ffc9ac028774 /fs/locks.c | |
| parent | e2a9aa5ab2a4d1fb05fcdfa9661d54e437093297 (diff) | |
| parent | a04f144059ac09f2c3da50b5707df589044aad66 (diff) | |
| download | linux-c86daad2c25bfd4a33d48b7691afaa96d9c5ab46.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer fixes from Dmitry Torokhov:
"Just a few fixups to a couple of drivers"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elan_i2c - ignore signals when finishing updating firmware
Input: elan_i2c - clear INT before resetting controller
Input: atmel_mxt_ts - add T100 as a readable object
Input: edt-ft5x06 - increase allowed data range for threshold parameter
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions