diff options
| author | Patrick McHardy | 2010-04-20 16:02:01 +0200 |
|---|---|---|
| committer | Patrick McHardy | 2010-04-20 16:02:01 +0200 |
| commit | 62910554656cdcd6b6f84a5154c4155aae4ca231 (patch) | |
| tree | dcf14004f6fd2ef7154362ff948bfeba0f3ea92d /include/linux/netfilter_bridge.h | |
| parent | netfilter: xt_TEE: resolve oif using netdevice notifiers (diff) | |
| parent | net: emphasize rtnl lock required in call_netdevice_notifiers (diff) | |
| download | kernel-qcow2-linux-62910554656cdcd6b6f84a5154c4155aae4ca231.tar.gz kernel-qcow2-linux-62910554656cdcd6b6f84a5154c4155aae4ca231.tar.xz kernel-qcow2-linux-62910554656cdcd6b6f84a5154c4155aae4ca231.zip | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/netfilter_bridge.h')
0 files changed, 0 insertions, 0 deletions