diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /fs/befs/linuxvfs.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 06457ed8f3e..54b8c28bebc 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 |