commit | 122c4f10f7b66f9c7a0177de668e9662b0b14a05 | [log] [tgz] |
---|---|---|
author | Patrick McHardy <kaber@trash.net> | Thu Jun 16 17:09:54 2011 +0200 |
committer | Patrick McHardy <kaber@trash.net> | Thu Jun 16 17:09:54 2011 +0200 |
tree | c30c5b546651fb97eb7ce1867e24091fadf28447 | |
parent | 264524d5e5195f6e0f099bee20253a22b651e272 [diff] | |
parent | 8f4e0a18682d91abfad72ede3d3cb5f3ebdf54b4 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6