]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e08969c 6a23ae0)
Merge tag 'v6.18-rc6' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 18 Nov 2025 07:16:55 +0000 (23:16 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 18 Nov 2025 07:16:55 +0000 (23:16 -0800)
Sync up with the mainline to bring in definition of
INPUT_PROP_HAPTIC_TOUCHPAD.

1  2 
drivers/input/keyboard/cros_ec_keyb.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/keyboard/cros_ec_keyb.c
Simple merge
A mirror of Linus' kernel repository