projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
319645c
27b9d5a
)
Merge branch 'for-dmitry/logitech-g920-merge-base' into for-4.5/logitech
author
Jiri Kosina
<jkosina@suse.cz>
Fri, 20 Nov 2015 09:28:40 +0000
(10:28 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Fri, 20 Nov 2015 09:28:40 +0000
(10:28 +0100)
Pull the branch that has been established to be jointly merged to both hid.git
and input.git, because both trees have different depending patches on top.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1
2
drivers/input/joystick/xpad.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/input/joystick/xpad.c
Simple merge