diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-22 13:57:32 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-22 13:57:32 -0400 |
| commit | 6d11fb454b161a4565c57be6f1c5527235741003 (patch) | |
| tree | c238ed3df2f654181c2a0746478a33b32214cc60 /net/core/gen_stats.c | |
| parent | b207892b061da7608878e273ae22ba9bf9be264b (diff) | |
| parent | 8b95741569eabc5eb17da71d1d3668cdb0bef86c (diff) | |
Merge branch 'for-linus' into for-3.18/core
Moving patches from for-linus to 3.18 instead, pull in this changes
that will go to Linus today.
Diffstat (limited to 'net/core/gen_stats.c')
| -rw-r--r-- | net/core/gen_stats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c index 9d3d9e78397b..2ddbce4cce14 100644 --- a/net/core/gen_stats.c +++ b/net/core/gen_stats.c | |||
| @@ -206,7 +206,7 @@ EXPORT_SYMBOL(gnet_stats_copy_queue); | |||
| 206 | * @st: application specific statistics data | 206 | * @st: application specific statistics data |
| 207 | * @len: length of data | 207 | * @len: length of data |
| 208 | * | 208 | * |
| 209 | * Appends the application sepecific statistics to the top level TLV created by | 209 | * Appends the application specific statistics to the top level TLV created by |
| 210 | * gnet_stats_start_copy() and remembers the data for XSTATS if the dumping | 210 | * gnet_stats_start_copy() and remembers the data for XSTATS if the dumping |
| 211 | * handle is in backward compatibility mode. | 211 | * handle is in backward compatibility mode. |
| 212 | * | 212 | * |