tree 9d9c8f381b86f473ac36db3602faea64d05dbaba
parent a76bfd0da2321ed0a978ccbef192856ce7ed687a
parent 02c471cb17203c748e9bc87003052c1f46e5df69
author Linus Torvalds <torvalds@linux-foundation.org> 1210901308 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210901308 -0700

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