| commit | 8ccf863f09bbff209b124cbd90644c0b75b8fefd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 18 13:25:03 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 18 13:25:03 2014 -0700 |
| tree | 180f1a8cf8bd735cc30ce330825f1f1d3d186067 | |
| parent | 4869447d21738f9d5bfdf2e9644bcc62db288d88 [diff] | |
| parent | d4bf205da618bbd0b038e404d646f14e76915718 [diff] |
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/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