git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 507614b e49d033)
Merge 5.12-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/staging/rtl8192e/rtllib_rx.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/staging/rtl8192e/rtllib_rx.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.