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/gfs2/glock.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/gfs2/glock.c')
| -rw-r--r-- | fs/gfs2/glock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index e2431313491..f07643e21bf 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
| @@ -1123,7 +1123,7 @@ void gfs2_glock_dq_uninit(struct gfs2_holder *gh) | |||
| 1123 | * @number: the lock number | 1123 | * @number: the lock number |
| 1124 | * @glops: the glock operations for the type of glock | 1124 | * @glops: the glock operations for the type of glock |
| 1125 | * @state: the state to acquire the glock in | 1125 | * @state: the state to acquire the glock in |
| 1126 | * @flags: modifier flags for the aquisition | 1126 | * @flags: modifier flags for the acquisition |
| 1127 | * @gh: the struct gfs2_holder | 1127 | * @gh: the struct gfs2_holder |
| 1128 | * | 1128 | * |
| 1129 | * Returns: errno | 1129 | * Returns: errno |