| commit | e9cab24cf3e5610898fb26bfd664615d0fd6a8d6 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 25 Aug 2009 16:47:36 +0000 (25 09:47 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 25 Aug 2009 16:47:36 +0000 (25 09:47 -0700) | ||
| tree | 5e2ac2f09655514fa1d7b69e13c83d5d04b20693 | treesnapshot (tar.gz zip) |
| parent | a206e9417f19cf42156249953b72223a0076dc6b | commitdiff |
| parent | 3c4cec65274481ec6332b0a91f19b4c8c5394801 | commitdiff |
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
ext3: Improve error message that changing journaling mode on remount is not possible
ext3: Update Kconfig description of EXT3_DEFAULTS_TO_ORDERED
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
ext3: Improve error message that changing journaling mode on remount is not possible
ext3: Update Kconfig description of EXT3_DEFAULTS_TO_ORDERED