commit | 619c15171f6f58681013cdd439632505fd563ba6 | [log] [tgz] |
---|---|---|
author | Patrick McHardy <kaber@trash.net> | Thu Jun 16 17:05:24 2011 +0200 |
committer | Patrick McHardy <kaber@trash.net> | Thu Jun 16 17:05:24 2011 +0200 |
tree | bec683960a4f816731717efc1622f15895079f19 | |
parent | 1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3 [diff] | |
parent | 6c8f7949931854be360fcc7f008f2672dc17996f [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next-2.6