summaryrefslogtreecommitdiff
path: root/flowtop
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-05-16 10:01:39 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-05-16 10:01:39 +0200
commit4503f1183db6686f123ccbb20bda408c8d4567a3 (patch)
tree3368ae0838a2cbc87720ecd1edfb478a3faca26b /flowtop
parent7a5228ac1f8e82f86dcc1fd5037ec4c263d4036a (diff)
astraceroute: Mention exit after printing information in built-in help
Mention the fact that astraceroute exits after printing either the help of the version information. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'flowtop')
0 files changed, 0 insertions, 0 deletions
0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/arch')