From: Lei Xia <lxia@northwestern.edu>
Date: Fri, 6 May 2011 02:50:06 +0000 (-0500)
Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=a57b321b6e608bf4ff2ae7da11b5cba9d35de35f

Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel

Conflicts:

	palacios/src/vnet/Makefile
---

a57b321b6e608bf4ff2ae7da11b5cba9d35de35f
diff --cc palacios/src/vnet/Makefile
index 0433652,5140f3e..2b8f357
--- a/palacios/src/vnet/Makefile
+++ b/palacios/src/vnet/Makefile
@@@ -1,2 -1,3 +1,3 @@@
 +obj-$(V3_CONFIG_VNET) +=  vnet_core.o vnet_host.o vnet_hashtable.o
+ obj-y += null.o
 -obj-$(V3_CONFIG_VNET) +=  vnet_core.o