David S. Miller 6811d58fc1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	include/linux/if_link.h

2010-05-16 22:26:58 -07:00

..

Kconfig

net/macvtap: add vhost support

2010-02-18 14:08:38 -08:00

Makefile

…

net.c

Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2010-04-14 22:52:46 -07:00

vhost.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-05-16 22:26:58 -07:00

vhost.h

…