]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge remote-tracking branch 'pstore/for-next/pstore' into master
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 23:01:42 +0000 (10:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 23:01:42 +0000 (10:01 +1100)
# Conflicts:
# .mailmap


Trivial merge