diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /fs/gfs2 | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/ops_fstype.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index a054b526dc08..c1309ed1c496 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
| @@ -1001,7 +1001,7 @@ static const struct lm_lockops nolock_ops = { | |||
| 1001 | /** | 1001 | /** |
| 1002 | * gfs2_lm_mount - mount a locking protocol | 1002 | * gfs2_lm_mount - mount a locking protocol |
| 1003 | * @sdp: the filesystem | 1003 | * @sdp: the filesystem |
| 1004 | * @args: mount arguements | 1004 | * @args: mount arguments |
| 1005 | * @silent: if 1, don't complain if the FS isn't a GFS2 fs | 1005 | * @silent: if 1, don't complain if the FS isn't a GFS2 fs |
| 1006 | * | 1006 | * |
| 1007 | * Returns: errno | 1007 | * Returns: errno |