Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 42c2264a154c9b3497cda8f6488f6e1cfcddbc44..4b58d54159294812a79a5847c3eb3ab3f3f50d2d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5550,6 +5550,18 @@ L:       cbe-oss-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/block/ps3vram.c
 
+PSTORE FILESYSTEM
+M:     Anton Vorontsov <cbouatmailru@gmail.com>
+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.infradead.org/users/cbou/linux-pstore.git
+F:     fs/pstore/
+F:     include/linux/pstore*
+F:     drivers/firmware/efivars.c
+F:     drivers/acpi/apei/erst.c
+
 PTP HARDWARE CLOCK SUPPORT
 M:     Richard Cochran <richardcochran@gmail.com>
 S:     Maintained