Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 05:25:36 +0000 (16:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 05:25:36 +0000 (16:25 +1100)
commit8882b1dd06c080de9dfaca151dc9a59b6b2aaa45
tree0e8bca5336b6b7163e9b74b1a27d5ceab5d921fa
parentcb998ef163dfc4c51245f68a7b11e6397e9f0e0b
parentdbbe23c31922ff773a0847a5c1d3c41050fe1c67
Merge branch 'staging-next' of git://git./linux/kernel/git/gregkh/staging.git

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