Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

Browse source

Conflicts:

	net/netfilter/nf_conntrack_netlink.c

...

This commit is contained in:

David S. Miller 2008-11-28 02:19:15 -08:00

parent 475ad8e217 d6e8cc6cc7

commit ed77a89c30

40 changed files with 514 additions and 221 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/bridge/br_netfilter.c

View file

26

net/bridge/netfilter/ebtable_broute.c

View file

41

net/bridge/netfilter/ebtable_filter.c

View file

38

net/bridge/netfilter/ebtable_nat.c

View file

52

net/bridge/netfilter/ebtables.c

View file

3

net/ipv4/netfilter.c

View file

12

net/ipv4/netfilter/arptable_filter.c

View file

16

net/ipv4/netfilter/ipt_addrtype.c

View file

23

net/ipv4/netfilter/nf_nat_rule.c

View file

5

net/ipv6/netfilter.c

View file

17

net/ipv6/netfilter/ip6table_filter.c

View file

1

net/netfilter/nf_conntrack_amanda.c

View file

61

net/netfilter/nf_conntrack_core.c

View file

14

net/netfilter/nf_conntrack_ecache.c

View file

43

net/netfilter/nf_conntrack_expect.c

View file

9

net/netfilter/nf_conntrack_ftp.c

View file

1

net/netfilter/nf_conntrack_h323_main.c

View file

32

net/netfilter/nf_conntrack_helper.c

View file

1

net/netfilter/nf_conntrack_irc.c

View file

1

net/netfilter/nf_conntrack_netbios_ns.c

View file

201

net/netfilter/nf_conntrack_netlink.c

View file

1

net/netfilter/nf_conntrack_pptp.c

View file

2

net/netfilter/nf_conntrack_proto_gre.c

View file

2

net/netfilter/nf_conntrack_proto_sctp.c

View file

1

net/netfilter/nf_conntrack_sane.c

View file

1

net/netfilter/nf_conntrack_sip.c

View file

1

net/netfilter/nf_conntrack_tftp.c

View file

4

net/netfilter/nfnetlink_log.c

View file

5

net/netfilter/xt_NFLOG.c

View file

22

net/netfilter/xt_recent.c

View file