]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62d4680 0320ed0)
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)
# Conflicts:
# drivers/nvmem/Kconfig
# drivers/nvmem/Makefile


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.