summaryrefslogtreecommitdiffstats
path: root/include/sound/memalloc.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 18:38:18 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 18:38:18 +0100
commit024e4ec1856d57bb78c06ec903d29dcf716f5f47 (patch)
tree72c89ea735f2aad2f63f64444ec056d7da8e06ff /include/sound/memalloc.h
parentMerge tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland... (diff)
parentpstore: Create a convenient mount point for pstore (diff)
downloadlinux-024e4ec1856d57bb78c06ec903d29dcf716f5f47.tar.xz
linux-024e4ec1856d57bb78c06ec903d29dcf716f5f47.zip
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
Diffstat (limited to 'include/sound/memalloc.h')
0 files changed, 0 insertions, 0 deletions