Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6] / include / linux / vhost.h
2010-01-15 Michael S. Tsirkinvhost_net: a kernel-level virtio server