diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-25 01:32:59 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-25 01:32:59 +0200 |
| commit | 1c5ba67d2277ac2faf37c61076e8b5fa312be492 (patch) | |
| tree | a645a1a2f7aea7faafcd67c6ba1bfd424b95cd7d /CREDITS | |
| parent | dbb5281a1f84b2f93032d4864c211ce8a20811a7 (diff) | |
| parent | 045df37e743c7448931131988e99e8fe0cc92a54 (diff) | |
| download | linux-riscv-1c5ba67d2277ac2faf37c61076e8b5fa312be492.tar.gz linux-riscv-1c5ba67d2277ac2faf37c61076e8b5fa312be492.tar.bz2 linux-riscv-1c5ba67d2277ac2faf37c61076e8b5fa312be492.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2
boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer
and fe03d4745675 ("Update my email address") which updates Jozsef
Kadlecsik's email.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -3364,6 +3364,14 @@ S: Braunschweiger Strasse 79 S: 31134 Hildesheim S: Germany +N: Martin Schwidefsky +D: Martin was the most significant contributor to the initial s390 +D: port of the Linux Kernel and later the maintainer of the s390 +D: architecture backend for almost two decades. +D: He passed away in 2019, and will be greatly missed. +S: Germany +W: https://lwn.net/Articles/789028/ + N: Marcel Selhorst E: tpmdd@selhorst.net D: TPM driver |