Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Oct 2014 20:25:03 +0000 (13:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Oct 2014 20:25:03 +0000 (13:25 -0700)
commit8ccf863f09bbff209b124cbd90644c0b75b8fefd
tree180f1a8cf8bd735cc30ce330825f1f1d3d186067
parent4869447d21738f9d5bfdf2e9644bcc62db288d88
parentd4bf205da618bbd0b038e404d646f14e76915718
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