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/ext4/migrate.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/ext4/migrate.c')
| -rw-r--r-- | fs/ext4/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c index d1bafa57f483..92816b4e0f16 100644 --- a/fs/ext4/migrate.c +++ b/fs/ext4/migrate.c | |||
| @@ -517,7 +517,7 @@ int ext4_ext_migrate(struct inode *inode) | |||
| 517 | * start with one credit accounted for | 517 | * start with one credit accounted for |
| 518 | * superblock modification. | 518 | * superblock modification. |
| 519 | * | 519 | * |
| 520 | * For the tmp_inode we already have commited the | 520 | * For the tmp_inode we already have committed the |
| 521 | * trascation that created the inode. Later as and | 521 | * trascation that created the inode. Later as and |
| 522 | * when we add extents we extent the journal | 522 | * when we add extents we extent the journal |
| 523 | */ | 523 | */ |