OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4add635
8fe28cb
)
Merge tag 'v4.20' into for-linus
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Mon, 14 Jan 2019 23:33:23 +0000
(15:33 -0800)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Mon, 14 Jan 2019 23:33:23 +0000
(15:33 -0800)
Sync with mainline to get linux/overflow.h among other things.
1
2
drivers/clk/mmp/clk-of-mmp2.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/misc/rotary_encoder.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/serio/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/touchscreen/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/touchscreen/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
include/uapi/linux/input.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/clk/mmp/clk-of-mmp2.c
Simple merge
diff --cc
drivers/input/misc/rotary_encoder.c
Simple merge
diff --cc
drivers/input/serio/Kconfig
Simple merge
diff --cc
drivers/input/touchscreen/Kconfig
Simple merge
diff --cc
drivers/input/touchscreen/Makefile
Simple merge
diff --cc
include/uapi/linux/input.h
Simple merge