Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 03:29:32 +0000 (14:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 03:29:32 +0000 (14:29 +1100)
commit250c0c169418187b37da563471ff3dcf7ad84668
treeb39cf1bb1493b473a6885bb79ea9fe0eed1a4e02
parent6bc5a0d829c5d83faebed61ef67817c78262a864
parentee60db9e1738ad7b68623f6ca46d6802a4e8f871
Merge branch 'for-next' of git://git./linux/kernel/git/broonie/spi.git

# Conflicts:
# arch/arm/mach-pxa/stargate2.c
MAINTAINERS
drivers/spi/Kconfig
include/linux/spi/spi.h