diff options
| author |   James Morris <james.l.morris@oracle.com> | 2018-01-09 11:40:59 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2018-01-09 11:40:59 +1100 |
| commit | ebceb1c87c0c482d47cb92dc3cc51d28f7387716 (patch) | |
| tree | 3fa626d8a7fddc9eba60dcd8c77fbf8a8ab656cd /MAINTAINERS | |
| parent | Sync to v4.15-rc3 for security subsystem developers to work against. (diff) | |
| parent | tpm: remove unused variables (diff) | |
| download | linux-dev-ebceb1c87c0c482d47cb92dc3cc51d28f7387716.tar.xz linux-dev-ebceb1c87c0c482d47cb92dc3cc51d28f7387716.zip | |
Merge tag 'tpmdd-next-20180108' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm
tpmdd updates for Linux 4.16
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 82ad0eabce4f..40413abcc624 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13809,9 +13809,10 @@ F: drivers/platform/x86/toshiba-wmi.c TPM DEVICE DRIVER M: Peter Huewe <peterhuewe@gmx.de> M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> -R: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> +R: Jason Gunthorpe <jgg@ziepe.ca> L: linux-integrity@vger.kernel.org Q: https://patchwork.kernel.org/project/linux-integrity/list/ +W: https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity T: git git://git.infradead.org/users/jjs/linux-tpmdd.git S: Maintained F: drivers/char/tpm/ |