projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7bd581f
7e18e42
)
Merge 6.0-rc4 into staging-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 5 Sep 2022 05:57:37 +0000
(07:57 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 5 Sep 2022 05:57:37 +0000
(07:57 +0200)
Resolves the merge issue with:
drivers/staging/r8188eu/os_dep/os_intfs.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1
2
drivers/staging/r8188eu/os_dep/usb_intf.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/staging/r8188eu/os_dep/usb_intf.c
Simple merge