diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /fs/befs/linuxvfs.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.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 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 |