projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83fc580 3aceaa3)
Merge branch 'psmouse' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 17 Mar 2018 17:58:05 +0000 (10:58 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 17 Mar 2018 17:58:05 +0000 (10:58 -0700)
Merge various PS/2 handling improvements.

1  2 
drivers/input/mouse/psmouse-base.c patch | diff1 | diff2 | blob | history
drivers/input/mouse/synaptics.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/mouse/psmouse-base.c
Simple merge
diff --cc drivers/input/mouse/synaptics.c
Simple merge
Linux 6.x block layer and io_uring tree(s)