Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Showing
- include/linux/netfilter/x_tables.h 19 additions, 26 deletionsinclude/linux/netfilter/x_tables.h
- net/bridge/br_netfilter.c 1 addition, 1 deletionnet/bridge/br_netfilter.c
- net/bridge/netfilter/ebt_802_3.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_802_3.c
- net/bridge/netfilter/ebt_among.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_among.c
- net/bridge/netfilter/ebt_arp.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_arp.c
- net/bridge/netfilter/ebt_arpreply.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_arpreply.c
- net/bridge/netfilter/ebt_dnat.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_dnat.c
- net/bridge/netfilter/ebt_ip.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_ip.c
- net/bridge/netfilter/ebt_ip6.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_ip6.c
- net/bridge/netfilter/ebt_limit.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_limit.c
- net/bridge/netfilter/ebt_log.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_log.c
- net/bridge/netfilter/ebt_mark.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_mark.c
- net/bridge/netfilter/ebt_mark_m.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_mark_m.c
- net/bridge/netfilter/ebt_nflog.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_nflog.c
- net/bridge/netfilter/ebt_pkttype.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_pkttype.c
- net/bridge/netfilter/ebt_redirect.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_redirect.c
- net/bridge/netfilter/ebt_snat.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_snat.c
- net/bridge/netfilter/ebt_stp.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_stp.c
- net/bridge/netfilter/ebt_ulog.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_ulog.c
- net/bridge/netfilter/ebt_vlan.c 1 addition, 1 deletionnet/bridge/netfilter/ebt_vlan.c
Please register or sign in to comment