diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-17 17:15:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-17 17:15:23 -0700 |
| commit | 06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd (patch) | |
| tree | 005b082022d26df89a06965cc29e28ac67018870 /net/bridge/br_netlink.c | |
| parent | 4cf7562190c795f1f95be6ee0d161107d0dc5d49 (diff) | |
| parent | 5a4fe0624687e62919a5913dc7c937fbfcf61fdc (diff) | |
Merge tag 'pstore-v5.9-rc2' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net/bridge/br_netlink.c')
0 files changed, 0 insertions, 0 deletions