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

Pull pstore changes from Anton Vorontsov:

 1) We no longer ad-hoc to the function tracer "high level"
    infrastructure and no longer use its debugfs knobs.  The change
    slightly touches kernel/trace directory, but it got the needed ack
    from Steven Rostedt:

      http://lkml.org/lkml/2012/8/21/688

 2) Added maintainers entry;

 3) A bunch of fixes, nothing special.

* tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore:
  pstore: Avoid recursive spinlocks in the oops_in_progress case
  pstore/ftrace: Convert to its own enable/disable debugfs knob
  pstore/ram: Add missing platform_device_unregister
  MAINTAINERS: Add pstore maintainers
  pstore/ram: Mark ramoops_pstore_write_buf() as notrace
  pstore/ram: Fix printk format warning
  pstore/ram: Fix possible NULL dereference

1 files changed, 12 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 42c2264a154c..4b58d5415929 100644
--- 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