From: Linus Torvalds Date: Mon, 21 Nov 2011 20:11:37 +0000 (-0800) Subject: Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f8f5ed7c996ad9426847ce09b828d415cb19bc06;p=linux.git Merge branch 'dev' of git://git./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 --- f8f5ed7c996ad9426847ce09b828d415cb19bc06