summaryrefslogtreecommitdiff
path: root/curvetun/.gitignore
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-11-25 10:04:50 +0100
committerDaniel Borkmann <dborkman@redhat.com>2013-11-25 10:05:55 +0100
commitb168f5f60a9cc4490b499a067da5273b0f40337c (patch)
tree2294e8872f330e34574c329b4dfbaef3441ef756 /curvetun/.gitignore
parent6feb59668308a326ec979b7992613138b986c985 (diff)
trafgen: inherit netsniff-ng's -H -Q options
Also make these options available to trafgen. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'curvetun/.gitignore')
0 files changed, 0 insertions, 0 deletions
b (diff)
Merge branch 'patchwork' into v4l_for_linus
* patchwork: [media] s5k4ecgx: select CRC32 helper [media] dvb: avoid warning in dvb_net [media] v4l: tvp5150: Don't override output pinmuxing at stream on/off time [media] v4l: tvp5150: Fix comment regarding output pin muxing [media] v4l: tvp5150: Reset device at probe time, not in get/set format handlers [media] pctv452e: move buffer to heap, no mutex [media] media/cobalt: use pci_irq_allocate_vectors [media] cec: fix race between configuring and unconfiguring [media] cec: move cec_report_phys_addr into cec_config_thread_func [media] cec: replace cec_report_features by cec_fill_msg_report_features [media] cec: update log_addr[] before finishing configuration [media] cec: CEC_MSG_GIVE_FEATURES should abort for CEC version < 2 [media] cec: when canceling a message, don't overwrite old status info [media] cec: fix report_current_latency [media] smiapp: Make suspend and resume functions __maybe_unused [media] smiapp: Implement power-on and power-off sequences without runtime PM
Diffstat (limited to 'include/net/ip6_checksum.h')