]> 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: b2d6c17 0320ed0)
Merge remote-tracking branch 'slimbus/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 08:09:22 +0000 (18:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 08:09:22 +0000 (18:09 +1000)
# Conflicts:
# drivers/nvmem/Kconfig
# drivers/nvmem/Makefile


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