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

include/linux/netfilter/ipset/ip_set_getport.h

net/ipv4/netfilter/ip_tables.c

net/ipv4/netfilter/ipt_CLUSTERIP.c

net/ipv6/netfilter/ip6_tables.c

net/netfilter/ipset/ip_set_core.c

net/netfilter/ipset/ip_set_hash_ipport.c

net/netfilter/ipset/ip_set_hash_ipportip.c

net/netfilter/ipset/ip_set_hash_ipportnet.c

net/netfilter/ipset/ip_set_hash_netport.c