| commit | f8f5ed7c996ad9426847ce09b828d415cb19bc06 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 21 12:11:37 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 21 12:11:37 2011 -0800 |
| tree | ef5826a0b818ef6130c67da63a8bb8aa81b19dde | |
| parent | c292fe4aae5aa5c089633bc40342d27c8275306a [diff] | |
| parent | 6e58ad69efe9f4c91eb15f6bc365293414c397ce [diff] |
Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix up a undefined error in ext4_free_blocks in debugging code ext4: add blk_finish_plug in error case of writepages. ext4: Remove kernel_lock annotations ext4: ignore journalled data options on remount if fs has no journal