tree 4b41acff6edf29fd7ea23bdadfb95bcf67165590
parent 02015180e2509afd2e3fe3790a333b30708a116b
parent a5e8546a8bff5d2047adc279df5753c44ba7b1a1
author David S. Miller <davem@davemloft.net> 1223501196 -0700
committer David S. Miller <davem@davemloft.net> 1223501196 -0700

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

Conflicts:

	net/netfilter/Kconfig