diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 10:01:14 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 10:01:14 +1100 |
| commit | 457d1c01af0387f024b79353214dc55f2c2d3846 (patch) | |
| tree | 57c78950f00c5d01d3b1d6ab96de2495118e0db8 /MAINTAINERS | |
| parent | de0b935c768f3e7bb6b7dfd320daba342fa1a786 (diff) | |
| parent | fc1b326efd276e7d121f5c1ced2884ae52a85814 (diff) | |
Merge remote-tracking branch 'pstore/for-next/pstore'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e80d8b796894..619847fdf178 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10020,16 +10020,19 @@ S: Maintained F: drivers/block/ps3vram.c PSTORE FILESYSTEM +M: Kees Cook <keescook@chromium.org> M: Anton Vorontsov <anton@enomsg.org> M: Colin Cross <ccross@android.com> -M: Kees Cook <keescook@chromium.org> M: Tony Luck <tony.luck@intel.com> S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore F: fs/pstore/ F: include/linux/pstore* F: drivers/firmware/efi/efi-pstore.c F: drivers/acpi/apei/erst.c +F: Documentation/admin-guide/ramoops.rst +F: Documentation/devicetree/bindings/reserved-memory/ramoops.txt +K: \b(pstore|ramoops) PTP HARDWARE CLOCK SUPPORT M: Richard Cochran <richardcochran@gmail.com> |