tree 116ad4df5c8faa5f8e0d7982c479bf08ea01f2ec
parent f470f8d4e702593ee1d0852871ad80373bce707b
parent b238b8fa93353ab50c9a2b1e2fa47a0ab01c37cd
author Linus Torvalds <torvalds@linux-foundation.org> 1320169949 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320169949 -0700

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: make pstore write function return normal success/fail value
  pstore: change mutex locking to spin_locks
  pstore: defer inserting OOPS entries into pstore