Merge branch 'stealer/ipvs/for-davem' of git://git.stealer.net/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 12 Aug 2008 01:04:35 +0000 (18:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Aug 2008 01:04:35 +0000 (18:04 -0700)

Trivial merge