From: Linus Torvalds Date: Fri, 16 May 2008 01:28:28 +0000 (-0700) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 X-Git-Tag: v2.6.26-rc3~25 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac0e9c30b1cb22c01f3edbb94857de2bae7611ca;p=linux-2.6 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: jbd2: update transaction t_state to T_COMMIT fix ext4: Retry block allocation if new blocks are allocated from system zone. ext4: mballoc fix mb_normalize_request algorithm for 1KB block size filesystems ext4: fix typos in messages and comments (journalled -> journaled) ext4: fix synchronization of quota files in journal=data mode ext4: Fix mount messages when quota disabled ext4: correct mount option parsing to detect when quota options can be changed --- ac0e9c30b1cb22c01f3edbb94857de2bae7611ca