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/super.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/super.c')
| -rw-r--r-- | fs/gfs2/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index ec73ed70bae..a4e23d68a39 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
| @@ -657,7 +657,7 @@ out: | |||
| 657 | * @sdp: the file system | 657 | * @sdp: the file system |
| 658 | * | 658 | * |
| 659 | * This function flushes data and meta data for all machines by | 659 | * This function flushes data and meta data for all machines by |
| 660 | * aquiring the transaction log exclusively. All journals are | 660 | * acquiring the transaction log exclusively. All journals are |
| 661 | * ensured to be in a clean state as well. | 661 | * ensured to be in a clean state as well. |
| 662 | * | 662 | * |
| 663 | * Returns: errno | 663 | * Returns: errno |