Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Dec 2014 19:34:13 +0000 (11:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Dec 2014 19:34:13 +0000 (11:34 -0800)
commit6ce4436c9cbe903af935291aa219fd6f4c85722d
tree43dedf78042c619d8b5b0a77d6937eb22805d874
parentbdeb03cada1c305346505c48e5b1dab37e9acc4e
parent027bc8b08242c59e19356b4b2c189f2d849ab660
Merge tag 'please-pull-morepstore' of git://git./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