git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5308d1 08d6ac9)
Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
Prepare input updates for 4.14 merge window.

1  2 
drivers/input/joystick/xpad.c patch | diff1 | diff2 | blob | history
drivers/input/mouse/elan_i2c_core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/joystick/xpad.c
Simple merge
diff --cc drivers/input/mouse/elan_i2c_core.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.