From: David S. Miller <davem@davemloft.net>
Date: Wed, 8 Oct 2008 21:26:36 +0000 (-0700)
Subject: Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms... 
X-Git-Tag: v2.6.28-rc1~717^2~88
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db2bf2476b2d99d91b4ce87e102dd3a61e92366f;p=pandora-kernel.git

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

Conflicts:

	net/netfilter/Kconfig
---

db2bf2476b2d99d91b4ce87e102dd3a61e92366f
Reading git-diff-tree failed