Merge branch 'net-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 May 2010 10:42:49 +0000 (03:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 May 2010 10:42:49 +0000 (03:42 -0700)

Trivial merge