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

include/linux/netfilter.h

include/linux/netfilter/nf_conntrack_dccp.h

include/linux/netfilter/nfnetlink_conntrack.h

include/linux/netfilter/x_tables.h

include/linux/netfilter/xt_sctp.h

include/linux/netfilter_arp/arp_tables.h

include/linux/netfilter_bridge/ebt_nflog.h

include/linux/netfilter_ipv4.h

include/net/netfilter/nf_conntrack.h

include/net/netfilter/nf_conntrack_core.h

include/net/netfilter/nf_conntrack_l3proto.h

include/net/netfilter/nf_conntrack_l4proto.h

include/net/netfilter/nf_conntrack_tuple.h

include/net/netfilter/nf_nat_helper.h

include/net/netfilter/nf_nat_protocol.h

include/net/netfilter/nf_nat_rule.h

net/bridge/netfilter/Kconfig

net/bridge/netfilter/Makefile

net/bridge/netfilter/ebt_nflog.c

net/bridge/netfilter/ebtable_broute.c