Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 03:14:46 +0000 (14:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 03:14:46 +0000 (14:14 +1100)
commitfb13686d63a608a8e0f96eeba2f34b5fe2985173
treed5c832edb13d25547149cf1fdd69bb85d55481b7
parenteb6002ff63f486f6cb86d94b3dac54e07a0dcf38
parente9685834b1db754cbd07e31ad1a091f5d366dacf
Merge branch 'staging-next' of git://git./linux/kernel/git/gregkh/staging.git

# Conflicts:
# drivers/staging/fbtft/fbtft.h
# drivers/staging/r8188eu/include/ieee80211.h
drivers/staging/pi433/pi433_if.c
drivers/staging/r8188eu/include/rtw_cmd.h
drivers/staging/wfx/bus_spi.c