OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
060403f
fafef98
)
Merge branch 'next' into for-linus
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Thu, 1 Feb 2018 08:37:30 +0000
(
00:37
-0800)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Thu, 1 Feb 2018 08:37:30 +0000
(
00:37
-0800)
Prepare input updates for 4.16 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
drivers/input/mouse/synaptics.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/rmi4/rmi_driver.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/touchscreen/elants_i2c.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
diff --cc
drivers/input/mouse/synaptics.c
Simple merge
diff --cc
drivers/input/rmi4/rmi_driver.c
Simple merge
diff --cc
drivers/input/touchscreen/elants_i2c.c
Simple merge