Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs...
authorPatrick McHardy <kaber@trash.net>
Thu, 16 Jun 2011 15:05:24 +0000 (17:05 +0200)
committerPatrick McHardy <kaber@trash.net>
Thu, 16 Jun 2011 15:05:24 +0000 (17:05 +0200)
commit619c15171f6f58681013cdd439632505fd563ba6
treebec683960a4f816731717efc1622f15895079f19
parent1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3
parent6c8f7949931854be360fcc7f008f2672dc17996f
Merge branch 'master' of git://git./linux/kernel/git/horms/ipvs-next-2.6