From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Jan 2012 02:03:02 +0000 (-0800)
Subject: Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
X-Git-Tag: firefly_0821_release~3680^2~3830
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pstore' of git://git./linux/kernel/git/aegl/linux

* 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore: gracefully handle NULL pstore_info functions
  pstore: pass reason to backend write callback
---

6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd