| commit | db2bf2476b2d99d91b4ce87e102dd3a61e92366f | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Oct 08 14:26:36 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Oct 08 14:26:36 2008 -0700 |
| tree | 4b41acff6edf29fd7ea23bdadfb95bcf67165590 | |
| parent | 02015180e2509afd2e3fe3790a333b30708a116b [diff] | |
| parent | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 [diff] |
Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-2.6 Conflicts: net/netfilter/Kconfig