| commit | e1f8826f5159d4aca5709c5d8d427319665fd5a1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 27 09:31:09 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 27 09:31:09 2013 -0700 |
| tree | 2a42d2bffe5acb222d732d72b1bd4c002b683029 | |
| parent | 730d7d339884f20da28b59bf6f0a16af6400a113 [diff] | |
| parent | 721a769c034204e8e5f6ca4ecbff249e0225333b [diff] |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs Pull reiserfs and UDF fixes from Jan Kara: "The contains fix of an UDF oops when mounting corrupted media and a fix of a race in reiserfs leading to oops" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: reiserfs: fix race with flush_used_journal_lists and flush_journal_list reiserfs: remove useless flush_old_journal_lists udf: Fortify LVID loading