diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-15 21:28:52 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-15 21:38:04 -0400 |
| commit | b2efb3f0a1db62aff5e824125785ec6731143b6d (patch) | |
| tree | 67510cec69e18e55d82bed803428b2a5027d92bb /net/core/gen_stats.c | |
| parent | 4ac073640a528662a7c072a30e92e70ce00ded33 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
drm: backmerge tag 'v3.17-rc5' into drm-next
This is requested to get the fixes for intel and radeon into the
same tree for future development work.
i915_display.c: fix missing dev_priv conflict.
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 | * |