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 /include/linux/reiserfs_fs.h | |
| 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 'include/linux/reiserfs_fs.h')
| -rw-r--r-- | include/linux/reiserfs_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 0a3842aacba9..eca75df00fed 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
| @@ -1557,7 +1557,7 @@ struct tree_balance { | |||
| 1557 | /* When inserting an item. */ | 1557 | /* When inserting an item. */ |
| 1558 | #define M_INSERT 'i' | 1558 | #define M_INSERT 'i' |
| 1559 | /* When inserting into (directories only) or appending onto an already | 1559 | /* When inserting into (directories only) or appending onto an already |
| 1560 | existant item. */ | 1560 | existent item. */ |
| 1561 | #define M_PASTE 'p' | 1561 | #define M_PASTE 'p' |
| 1562 | /* When deleting an item. */ | 1562 | /* When deleting an item. */ |
| 1563 | #define M_DELETE 'd' | 1563 | #define M_DELETE 'd' |