diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /fs/befs/linuxvfs.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'fs/befs/linuxvfs.c')
| -rw-r--r-- | fs/befs/linuxvfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 06457ed8f3e7..54b8c28bebc8 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -734,7 +734,7 @@ parse_options(char *options, befs_mount_options * opts) | |||
| 734 | 734 | ||
| 735 | /* This function has the responsibiltiy of getting the | 735 | /* This function has the responsibiltiy of getting the |
| 736 | * filesystem ready for unmounting. | 736 | * filesystem ready for unmounting. |
| 737 | * Basicly, we free everything that we allocated in | 737 | * Basically, we free everything that we allocated in |
| 738 | * befs_read_inode | 738 | * befs_read_inode |
| 739 | */ | 739 | */ |
| 740 | static void | 740 | static void |