diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-02 12:18:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-02 12:18:02 -0700 |
commit | 0d2746a208ea5faaaccf9a5e97ad214cff0942f5 (patch) | |
tree | d426410fdf41d5fe68353701851ee88c27480aee /drivers/block/drbd/drbd_main.c | |
parent | 359cdf5a328360fdc41e5ca979f22625f4aceb44 (diff) | |
parent | c684771630e64bc39bddffeb65dd8a6612a6b249 (diff) | |
download | lwn-0d2746a208ea5faaaccf9a5e97ad214cff0942f5.tar.gz lwn-0d2746a208ea5faaaccf9a5e97ad214cff0942f5.zip |
Merge tag 'input-for-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
- a couple fixups for adp5589-keys driver
- recently added driver for PixArt PS/2 touchpads is dropped
temporarily because its detection routine is too greedy and
mis-identifies devices from other vendors as PixArt devices
* tag 'input-for-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: adp5589-keys - fix adp5589_gpio_get_value()
Input: adp5589-keys - fix NULL pointer dereference
Revert "Input: Add driver for PixArt PS/2 touchpad"
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
0 files changed, 0 insertions, 0 deletions