From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Oct 2012 08:30:50 +0000 (+0900)
Subject: Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore
X-Git-Tag: MMI-PSA29.97-13-9~15827
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f60ba388f5b9dd8b0da463b394412dace3ab814;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

7f60ba388f5b9dd8b0da463b394412dace3ab814