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 /include/linux/reiserfs_fs.h | |
| 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 '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 0a3842aacba..eca75df00fe 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' |