]> 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, 3 Jun 2021 07:08:01 +0000 (17:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 07:08:01 +0000 (17:08 +1000)
commitad9abff5a2a0d47fb0ccf771cf2fa399066ae975
tree15455b3e3bf5db8548f04e59753870c59d814ea9
parent62d4680040e31e2f37fefed726c7d831b3092dca
parent0320ed0a82364b3b175ab83ad11c7e4d9ad828a9
Merge remote-tracking branch 'slimbus/for-next'

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