diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /fs/ext3/super.c | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'fs/ext3/super.c')
| -rw-r--r-- | fs/ext3/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index e844accbf55..1bee604cc6c 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
| @@ -164,7 +164,7 @@ void ext3_msg(struct super_block *sb, const char *prefix, | |||
| 164 | * write out the superblock safely. | 164 | * write out the superblock safely. |
| 165 | * | 165 | * |
| 166 | * We'll just use the journal_abort() error code to record an error in | 166 | * We'll just use the journal_abort() error code to record an error in |
| 167 | * the journal instead. On recovery, the journal will compain about | 167 | * the journal instead. On recovery, the journal will complain about |
| 168 | * that error until we've noted it down and cleared it. | 168 | * that error until we've noted it down and cleared it. |
| 169 | */ | 169 | */ |
| 170 | 170 | ||