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/ocfs2/alloc.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/ocfs2/alloc.c')
| -rw-r--r-- | fs/ocfs2/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index b27a0d86f8c..48aa9c7401c 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
| @@ -4519,7 +4519,7 @@ set_tail_append: | |||
| 4519 | } | 4519 | } |
| 4520 | 4520 | ||
| 4521 | /* | 4521 | /* |
| 4522 | * Helper function called at the begining of an insert. | 4522 | * Helper function called at the beginning of an insert. |
| 4523 | * | 4523 | * |
| 4524 | * This computes a few things that are commonly used in the process of | 4524 | * This computes a few things that are commonly used in the process of |
| 4525 | * inserting into the btree: | 4525 | * inserting into the btree: |