summaryrefslogtreecommitdiff
path: root/include/linux/netfilter_bridge.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-08-26 20:18:49 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-26 20:18:49 -0700
commit8dbc16033e35c7443cd56cb5ba308bb19cb7b469 (patch)
treef849df3b657763ff401024a828e86b0b57af102c /include/linux/netfilter_bridge.h
parent81a42d298d8bd1b96be4bd459494f25fdd99b594 (diff)
parent80193aee18bc862e284ba18504f3a3e14706a997 (diff)
downloadlinux-3.10-8dbc16033e35c7443cd56cb5ba308bb19cb7b469.tar.gz
linux-3.10-8dbc16033e35c7443cd56cb5ba308bb19cb7b469.tar.bz2
linux-3.10-8dbc16033e35c7443cd56cb5ba308bb19cb7b469.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [DCCP]: Introduce dccp_rx_hist_find_entry [DCCP]: Introduces follows48 function [DCCP]: Update contact details and copyright [DCCP]: Fix typo [IPV6]: Segmentation offload not set correctly on TCP children [CONNECTOR]: Add userspace example code into Documentation/connector/
Diffstat (limited to 'include/linux/netfilter_bridge.h')
0 files changed, 0 insertions, 0 deletions