From: Linus Torvalds Date: Thu, 21 Feb 2013 17:38:18 +0000 (-0800) Subject: Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl... X-Git-Tag: v3.9-rc1~130 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=024e4ec1856d57bb78c06ec903d29dcf716f5f47;p=pandora-kernel.git Merge tag 'please-pull-pstore' of git://git./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 --- 024e4ec1856d57bb78c06ec903d29dcf716f5f47 Reading git-diff-tree failed