From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Oct 2014 20:25:03 +0000 (-0700)
Subject: Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl... 
X-Git-Tag: v3.18-rc1~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8ccf863f09bbff209b124cbd90644c0b75b8fefd;p=linux-block.git

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

Pull pstore fix from Tony Luck:
 "Ensure unique filenames in pstore"

* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore: Fix duplicate {console,ftrace}-efi entries
---

8ccf863f09bbff209b124cbd90644c0b75b8fefd