summaryrefslogtreecommitdiff
path: root/ring_tx.c
diff options
context:
space:
mode:
authorJon Schipp <jonschipp@gmail.com>2013-05-21 17:03:08 -0700
committerDaniel Borkmann <dborkman@redhat.com>2013-05-22 10:07:49 +0200
commit13fa215edf3d5aff0b0e736163a24ed0eac8ee1e (patch)
tree2e7cfb54e2e4f9f13996a3a336405400fa1f89aa /ring_tx.c
parentf8cddced1fdc246fa6432c648b887c32a1322647 (diff)
man: netsniff-ng: edits to the netsniff-ng man page
Various edits all over. Signed-off-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'ring_tx.c')
0 files changed, 0 insertions, 0 deletions
c?h=nds-private-remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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 'net/phonet/sysctl.c')