Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...

Conflicts:

	net/netfilter/Kconfig

diff --cc net/netfilter/Kconfig
index f70b4145ffc720e8fab16e85f2700dbc5c49422b,73f9378e1bfe3e051012f5bb690c23b4e9794392..78892cf2b021c0d4a4bedf05075535f44c125f82
--- 1/net/netfilter/Kconfig
--- 2/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@@ -855,6 -821,22 +855,8 @@@ config NETFILTER_XT_MATCH_U3
  
          Details and examples are in the kernel module source.
  
 -config NETFILTER_XT_MATCH_HASHLIMIT
 -      tristate '"hashlimit" match support'
 -      depends on NETFILTER_XTABLES && (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
 -      depends on NETFILTER_ADVANCED
 -      help
 -        This option adds a `hashlimit' match.
 -
 -        As opposed to `limit', this match dynamically creates a hash table
 -        of limit buckets, based on your selection of source/destination
 -        addresses and/or ports.
 -
 -        It enables you to express policies like `10kpps for any given
 -        destination address' or `500pps from any given source address'
 -        with a single rule.
 +endif # NETFILTER_XTABLES
  
  endmenu
 -
+ 
+ source "net/netfilter/ipvs/Kconfig"

diff --cc net/netfilter/Makefile
Simple merge