projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ba8b68 1e28eed)
Merge 5.12-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Mar 2021 06:52:17 +0000 (07:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Mar 2021 06:52:17 +0000 (07:52 +0100)
We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/staging/rtl8192u/r8192U_wx.c patch | diff1 | diff2 | blob | history
drivers/staging/wfx/sta.c patch | diff1 | diff2 | blob | history

diff --cc drivers/staging/rtl8192u/r8192U_wx.c
Simple merge
diff --cc drivers/staging/wfx/sta.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git