]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'slimbus/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 May 2021 00:37:30 +0000 (10:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 May 2021 00:37:30 +0000 (10:37 +1000)
commita178d831432f74b20a25057aa31fefa2b538c56f
tree7a9564d93d67912c92612c7050bf23be74c99d7a
parentdc1e3839195b41b56f113210ae7a5a53fd5574f0
parent0320ed0a82364b3b175ab83ad11c7e4d9ad828a9
Merge remote-tracking branch 'slimbus/for-next'

# Conflicts:
# drivers/nvmem/Kconfig
# drivers/nvmem/Makefile