commit 024e4ec1856d57bb78c06ec903d29dcf716f5f47
author Linus Torvalds <torvalds@linux-foundation.org> Thu Feb 21 09:38:18 2013 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Feb 21 09:38:18 2013 -0800
tree 72c89ea735f2aad2f63f64444ec056d7da8e06ff
parent 850cb82b754c931c570c9cb7f10c9f2181bac617
parent fb0af3f2b1b613e5ea75426d454c7e5b1d1eef49

Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull pstore patches from Tony Luck:
 "A few fixes to reduce places where pstore might hang a system in the
  crash path.  Plus a new mountpoint (/sys/fs/pstore ...  makes more
  sense then /dev/pstore)."

Fix up trivial conflict in drivers/firmware/efivars.c

* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore: Create a convenient mount point for pstore
  efi_pstore: Introducing workqueue updating sysfs
  efivars: Disable external interrupt while holding efivars->lock
  efi_pstore: Avoid deadlock in non-blocking paths
  pstore: Avoid deadlock in panic and emergency-restart path