From: Linus Torvalds Date: Fri, 12 Dec 2014 19:34:13 +0000 (-0800) Subject: Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6ce4436c9cbe903af935291aa219fd6f4c85722d;p=linux-beck.git Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux Pull pstore update #2 from Tony Luck: "Couple of pstore-ram enhancements to allow use of different memory attributes" * tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: pstore-ram: Allow optional mapping with pgprot_noncached pstore-ram: Fix hangs by using write-combine mappings --- 6ce4436c9cbe903af935291aa219fd6f4c85722d