projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 567b9b5 04bb171)
Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 4 Apr 2018 23:11:49 +0000 (16:11 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 4 Apr 2018 23:11:49 +0000 (16:11 -0700)
Prepare input updates for 4.17 merge window.

1  2 
drivers/input/mouse/alps.c patch | diff1 | diff2 | blob | history
drivers/input/mouse/synaptics.c patch | diff1 | diff2 | blob | history
drivers/input/serio/i8042-x86ia64io.h patch | diff1 | diff2 | blob | history

diff --cc drivers/input/mouse/alps.c
Simple merge
diff --cc drivers/input/mouse/synaptics.c
Simple merge
diff --cc drivers/input/serio/i8042-x86ia64io.h
Simple merge
Domain: System / Kernel;