From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Aug 2020 00:15:23 +0000 (-0700)
Subject: Merge tag 'pstore-v5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd;p=linux.git

Merge tag 'pstore-v5.9-rc2' of git://git./linux/kernel/git/kees/linux

Pull mailmap update from Kees Cook:
 "This was originally part of my pstore tree, but when I realized that
  mailmap needed re-alphabetizing, I decided to wait until -rc1 to send
  this, as I saw a lot of mailmap additions pending in -next for the
  merge window.

  It's a programmatic reordering and the addition of a pstore
  contributor's preferred email address"

* tag 'pstore-v5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  mailmap: Add WeiXiong Liao
  mailmap: Restore dictionary sorting
---

06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd