tree 5cb5bb5dbefbb6458eff4bdae3c091ca3c02d685
parent 5ee354a0295c34aa7da07be8490f86edee2c7883
parent 2174f6df7891fa331800beb72634c969f017900b
author Linus Torvalds <torvalds@linux-foundation.org> 1325901782 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325901782 -0800

Merge branch 'pstore' of git://git.kernel.org/pub/scm/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