Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Oct 2009 17:05:36 +0000 (10:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Oct 2009 17:05:36 +0000 (10:05 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  ext3: Update documentation about ext3 quota mount options
  ext3: Don't update superblock write time when filesystem is read-only


Trivial merge