Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 21:26:36 +0000 (14:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 21:26:36 +0000 (14:26 -0700)
commitdb2bf2476b2d99d91b4ce87e102dd3a61e92366f
tree4b41acff6edf29fd7ea23bdadfb95bcf67165590
parent02015180e2509afd2e3fe3790a333b30708a116b
parenta5e8546a8bff5d2047adc279df5753c44ba7b1a1
Merge branch 'lvs-next-2.6' of git://git./linux/kernel/git/horms/lvs-2.6

Conflicts:

net/netfilter/Kconfig
net/netfilter/Kconfig
net/netfilter/Makefile